From 3587859e816398f6cfab5d8370f62452bff88de3 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 16 Feb 2020 15:22:43 -0800 Subject: [PATCH 001/234] Allow jdiskreport to build on Darwin --- pkgs/tools/misc/jdiskreport/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 6b1c0d735ee..5fbae4da992 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { homepage = http://www.jgoodies.com/freeware/jdiskreport/; description = "A graphical utility to visualize disk usage"; license = licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ kylesferrazza ]; }; } From cb39af3ebdf37f2f8f7d8ea7e78ee84652706e1d Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 14 Oct 2019 13:55:11 -0700 Subject: [PATCH 002/234] plata-theme: Remove buildInputs; add GTK2 engines to path --- pkgs/data/themes/plata/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 69e6f0bb0d2..d3a01d45c0a 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, parallel -, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine +, sassc, inkscape, libxml2, glib, gtk2, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true , gnomeShellSupport ? true @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { sha256 = "1sqmydvx36f6r4snw22s2q4dvcyg30jd7kg7dibpzqn3njfkkfag"; }; - preferLocalBuild = true; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -42,13 +40,12 @@ stdenv.mkDerivation rec { ++ lib.optionals mateSupport [ gtk3 marco ] ++ lib.optional telegramSupport zip; - buildInputs = [ - gdk-pixbuf - librsvg + # GTK2 engines must be on the system path at runtime to be loaded. + propagatedUserEnvPkgs = [ + gtk2 + gtk-engine-murrine ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - postPatch = "patchShebangs ."; configureFlags = From 28828c4e8fac928ef8db7a2d6e04915c7b949c54 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sun, 14 Mar 2021 00:06:28 -0800 Subject: [PATCH 003/234] nixos/hidpi: add xserver dpi --- nixos/modules/hardware/video/hidpi.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/hardware/video/hidpi.nix b/nixos/modules/hardware/video/hidpi.nix index ac72b652504..c480cc481df 100644 --- a/nixos/modules/hardware/video/hidpi.nix +++ b/nixos/modules/hardware/video/hidpi.nix @@ -12,5 +12,6 @@ with lib; boot.loader.systemd-boot.consoleMode = mkDefault "1"; # TODO Find reasonable defaults X11 & wayland + services.xserver.dpi = lib.mkDefault 192; }; } From 80748d2789185a12416746b5b0caf1db65ffc1c6 Mon Sep 17 00:00:00 2001 From: Guillaume Desforges Date: Thu, 12 Mar 2020 15:06:06 +0100 Subject: [PATCH 004/234] scikit-survival: init at 0.11 --- .../scikit-survival/default.nix | 70 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/scikit-survival/default.nix diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix new file mode 100644 index 00000000000..9e9d074e30d --- /dev/null +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, ecos +, joblib +, numexpr +, numpy +, osqp +, pandas +, scikitlearn +, scipy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "scikit-survival"; + version = "0.15.0.post0"; + + src = fetchPypi { + inherit pname version; + sha256 = "572c3ac6818a9d0944fc4b8176eb948051654de857e28419ecc5060bcc6fbf37"; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + ecos + joblib + numexpr + numpy + osqp + pandas + scikitlearn + scipy + ]; + + pythonImportsCheck = [ "sksurv" ]; + + checkInputs = [ pytestCheckHook ]; + + # Hack needed to make pytest + cython work + # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 + preCheck = '' + export HOME=$(mktemp -d) + cp -r $TMP/$sourceRoot/tests $HOME + pushd $HOME + ''; + postCheck = "popd"; + + # very long tests, unnecessary for a leaf package + disabledTests = [ + "test_coxph" + "test_datasets" + "test_ensemble_selection" + "test_minlip" + "test_pandas_inputs" + "test_survival_svm" + "test_tree" + ]; + + meta = with lib; { + description = "Survival analysis built on top of scikit-learn"; + homepage = "https://github.com/sebp/scikit-survival"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ GuillaumeDesforges ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index edeb7ffb3d0..c2e5d634968 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7265,6 +7265,8 @@ in { scripttest = callPackage ../development/python-modules/scripttest { }; + scikit-survival = callPackage ../development/python-modules/scikit-survival { }; + scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; sdnotify = callPackage ../development/python-modules/sdnotify { }; From d691ecca03de60c60cd90792089a5f4eadc7539e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 1 Jun 2021 02:20:13 +0300 Subject: [PATCH 005/234] =?UTF-8?q?crow-translate:=202.8.1=20=E2=86=92=202?= =?UTF-8?q?.8.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../misc/crow-translate/default.nix | 27 ++++++++++++------ .../dont-fetch-external-libs.patch | 28 ++++++++++++------- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 76a5541f6db..6095a00f6e0 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -34,31 +34,37 @@ let qonlinetranslator = fetchFromGitHub { owner = "crow-translate"; repo = "QOnlineTranslator"; - rev = "1.4.1"; - sha256 = "1c6a8mdxms5vh8l7shi2kqdhafbzm50pbz6g1hhgg6qslla0vfn0"; + rev = "1.4.4"; + sha256 = "sha256-ogO6ovkQmyvTUPCYAQ4U3AxOju9r3zHB9COnAAfKSKA="; }; circleflags = fetchFromGitHub { owner = "HatScripts"; repo = "circle-flags"; - rev = "v2.0.0"; - sha256 = "1xz5b6nhcxxzalcgwnw36npap71i70s50g6b63avjgjkwz1ys5j4"; + rev = "v2.1.0"; + sha256 = "sha256-E0iTDjicfdGqK4r+anUZanEII9SBafeEUcMLf7BGdp0="; + }; + we10x = fetchFromGitHub { + owner = "yeyushengfan258"; + repo = "We10X-icon-theme"; + rev = "bd2c68482a06d38b2641503af1ca127b9e6540db"; + sha256 = "sha256-T1oPstmjLffnVrIIlmTTpHv38nJHBBGJ070ilRwAjk8="; }; in mkDerivation rec { pname = "crow-translate"; - version = "2.8.1"; + version = "2.8.4"; src = fetchFromGitHub { owner = "crow-translate"; - repo = "crow-translate"; + repo = pname; rev = version; - sha256 = "sha256-fmlNUhNorV/MUdfdDXM6puAblTTa6p2slVT/EKy5THg="; + sha256 = "sha256-TPJgKTZqsh18BQGFWgp0wsw1ehtI8ydQ7ZCvYNX6pH8="; }; patches = [ (substituteAll { src = ./dont-fetch-external-libs.patch; - inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags; + inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags we10x; }) (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 @@ -67,7 +73,10 @@ mkDerivation rec { }) ]; - postPatch = "cp -r ${circleflags}/flags/* data/icons"; + postPatch = '' + cp -r ${circleflags}/flags/* data/icons + cp -r ${we10x}/src/* data/icons + ''; nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; diff --git a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch index eff303a852c..116a55a9abd 100644 --- a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch +++ b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch @@ -1,26 +1,28 @@ diff --git i/CMakeLists.txt w/CMakeLists.txt -index 2576203..26162a0 100644 +index 0cd2140..16e3190 100644 --- i/CMakeLists.txt +++ w/CMakeLists.txt -@@ -91,12 +91,11 @@ qt5_add_translation(QM_FILES +@@ -97,13 +97,11 @@ qt5_add_translation(QM_FILES ) configure_file(src/cmake.h.in cmake.h) -configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY) +-configure_file(data/icons/we10x.qrc ${We10X_SOURCE_DIR}/src/we10x.qrc COPYONLY) add_executable(${PROJECT_NAME} - ${QM_FILES} - data/icons/engines/engines.qrc - ${CircleFlags_SOURCE_DIR}/flags/flags.qrc + data/icons/flags.qrc + ${QM_FILES} +- ${We10X_SOURCE_DIR}/src/we10x.qrc ++ data/icons/we10x.qrc + data/icons/engines/engines.qrc src/addlanguagedialog.cpp src/addlanguagedialog.ui - src/cli.cpp diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake -index 21eba0a..b613d3e 100644 +index d738716..fb01f3d 100644 --- i/cmake/ExternalLibraries.cmake +++ w/cmake/ExternalLibraries.cmake -@@ -2,29 +2,24 @@ include(FetchContent) +@@ -2,34 +2,28 @@ include(FetchContent) set(QAPPLICATION_CLASS QApplication) FetchContent_Declare(SingleApplication @@ -44,14 +46,20 @@ index 21eba0a..b613d3e 100644 FetchContent_Declare(QOnlineTranslator - GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator -- GIT_TAG 1.4.1 +- GIT_TAG 1.4.4 + SOURCE_DIR @qonlinetranslator@ ) FetchContent_Declare(CircleFlags - GIT_REPOSITORY https://github.com/HatScripts/circle-flags -- GIT_TAG v2.0.0 +- GIT_TAG v2.1.0 + SOURCE_DIR @circleflags@ ) - FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags) + FetchContent_Declare(We10X +- GIT_REPOSITORY https://github.com/yeyushengfan258/We10X-icon-theme +- GIT_TAG bd2c68482a06d38b2641503af1ca127b9e6540db ++ SOURCE_DIR @we10x@ + ) + + FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags We10X) From 6d8ce7e73f226e8437c2004e56a72e70e41b3d7e Mon Sep 17 00:00:00 2001 From: Alex Zero Date: Sun, 4 Jul 2021 22:40:21 +0100 Subject: [PATCH 006/234] libcamera: init at unstable-2021-06-02 --- .../libraries/libcamera/default.nix | 76 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/development/libraries/libcamera/default.nix diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix new file mode 100644 index 00000000000..90a946597e7 --- /dev/null +++ b/pkgs/development/libraries/libcamera/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, fetchgit +, lib +, meson +, ninja +, pkg-config +, boost +, gnutls +, openssl +, libevent +, lttng-ust +, gst_all_1 +, gtest +, graphviz +, doxygen +, python3 +, python3Packages +}: + +stdenv.mkDerivation { + pname = "libcamera"; + version = "unstable-2021-06-02"; + + src = fetchgit { + url = "git://linuxtv.org/libcamera.git"; + rev = "143b252462b9b795a1286a30349348642fcb87f5"; + sha256 = "0mlwgd3rxagzhmc94lnn6snriyqvfdpz8r8f58blcf16859galyl"; + }; + + postPatch = '' + patchShebangs utils/ + ''; + + buildInputs = [ + # IPA and signing + gnutls + openssl + boost + + # gstreamer integration + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + + # cam integration + libevent + + # lttng tracing + lttng-ust + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + python3Packages.jinja2 + python3Packages.pyyaml + python3Packages.ply + python3Packages.sphinx + gtest + graphviz + doxygen + ]; + + mesonFlags = [ "-Dv4l2=true" "-Dqcam=disabled" ]; + + # Fixes error on a deprecated declaration + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + + meta = with lib; { + description = "An open source camera stack and framework for Linux, Android, and ChromeOS"; + homepage = "https://libcamera.org"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ citadelcore ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be0b6059699..87c32b75e27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16084,6 +16084,8 @@ in libcacard = callPackage ../development/libraries/libcacard { }; + libcamera = callPackage ../development/libraries/libcamera { }; + libcanberra = callPackage ../development/libraries/libcanberra { inherit (darwin.apple_sdk.frameworks) CoreServices; }; From 91646d62b9cd513820a4b82371da341fa9ec1218 Mon Sep 17 00:00:00 2001 From: embr Date: Tue, 13 Jul 2021 16:53:09 +0200 Subject: [PATCH 007/234] google-compute-image: Make GZIP compression level configurable Change-Id: I1bde130f0a951fa40b1a16bad09497c796bca473 --- nixos/modules/virtualisation/google-compute-image.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 79c3921669e..0c72696f802 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -36,6 +36,14 @@ in ``. ''; }; + + virtualisation.googleComputeImage.compressionLevel = mkOption { + type = types.int; + default = 6; + description = '' + GZIP compression level of the resulting disk image (1-9). + ''; + }; }; #### implementation @@ -47,7 +55,8 @@ in PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]} pushd $out mv $diskImage disk.raw - tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz disk.raw + tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \ + nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz rm $out/disk.raw popd ''; From 1d8c437118e129bad33564f4d2a22fe212fae1a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 23:04:15 +0000 Subject: [PATCH 008/234] certbot: 1.16.0 -> 1.17.0 --- pkgs/development/python-modules/certbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 7c324e646a4..4ef7597e5e7 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0jdq6pvq7af2x483857qyp1qvqs4yb4nqcv66qi70glmbanhlxd4"; + sha256 = "sha256-07UfTIZUbRD19BQ0xlZXlZo/oiVLDFNq+N2pDnWwbwI="; }; sourceRoot = "source/${pname}"; From 92cced04c68ed114d2aa0041c9d3a493a46f03ec Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 25 Jul 2021 19:39:49 +1000 Subject: [PATCH 009/234] logisim-evolution: init at 3.5.0 --- .../logic/logisim-evolution/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/science/logic/logisim-evolution/default.nix diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix new file mode 100644 index 00000000000..10266abffea --- /dev/null +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchurl, jre, makeWrapper, copyDesktopItems, makeDesktopItem, unzip }: + +stdenv.mkDerivation rec { + pname = "logisim-evolution"; + version = "3.5.0"; + + src = fetchurl { + url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar"; + sha256 = "1r6im4gmjbnckx8jig6bxi5lxv06lwdnpxkyfalsfmw4nybd5arw"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper copyDesktopItems unzip ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Logisim-evolution"; + exec = "logisim-evolution"; + icon = "logisim-evolution"; + comment = meta.description; + categories = "Education;"; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/logisim-evolution --add-flags "-jar $src" + + unzip $src resources/logisim/img/logisim-icon.svg + install -D resources/logisim/img/logisim-icon.svg $out/share/pixmaps/logisim-evolution.svg + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/logisim-evolution/logisim-evolution"; + description = "Digital logic designer and simulator"; + maintainers = with maintainers; [ angustrau ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..89f2705d733 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30428,6 +30428,8 @@ in logisim = callPackage ../applications/science/logic/logisim {}; + logisim-evolution = callPackage ../applications/science/logic/logisim-evolution {}; + ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; metis-prover = callPackage ../applications/science/logic/metis-prover { }; From 9a88197fe7825f486052e3a9eca4a68192335978 Mon Sep 17 00:00:00 2001 From: Phil Dyer Date: Tue, 22 Jun 2021 22:27:21 +1000 Subject: [PATCH 010/234] R: 4.0.4 -> 4.1.0 Co-authored-by: Mauricio Collares <244239+collares@users.noreply.github.com> --- pkgs/applications/science/math/R/default.nix | 18 ++++++++++--- .../science/math/R/fix-failing-test.patch | 25 ------------------- 2 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 pkgs/applications/science/math/R/fix-failing-test.patch diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 827c817fd1a..0c9f700bd42 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -13,11 +13,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "R"; - version = "4.0.4"; + version = "4.1.0"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "0bl098xcv8v316kqnf43v6gb4kcsv31ydqfm1f7qr824jzb2fgsj"; + sha256 = "109732arm6dq6d6v3fl1nyx63lcvv9569j8g6r3s2b18sxcqkrp8"; }; dontUseImakeConfigure = true; @@ -30,7 +30,19 @@ stdenv.mkDerivation rec { patches = [ ./no-usr-local-search-paths.patch - ./fix-failing-test.patch + ] ++ lib.optionals (!withRecommendedPackages) [ + (fetchpatch { + name = "fix-tests-without-recommended-packages.patch"; + url = "https://github.com/wch/r-source/commit/7715c67cabe13bb15350cba1a78591bbb76c7bac.patch"; + # this part of the patch reverts something that was committed after R 4.1.0, so ignore it. + excludes = [ "tests/Pkgs/xDir/pkg/DESCRIPTION" ]; + sha256 = "sha256-iguLndCIuKuCxVCi/4NSu+9RzBx5JyeHx3K6IhpYshQ="; + }) + (fetchpatch { + name = "use-codetools-conditionally.patch"; + url = "https://github.com/wch/r-source/commit/7543c28b931db386bb254e58995973493f88e30d.patch"; + sha256 = "sha256-+yHXB5AItFyQjSxfogxk72DrSDGiBh7OiLYFxou6Xlk="; + }) ]; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/science/math/R/fix-failing-test.patch b/pkgs/applications/science/math/R/fix-failing-test.patch deleted file mode 100644 index 5fb3b3b9c31..00000000000 --- a/pkgs/applications/science/math/R/fix-failing-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e8f54bc562eb301d204b5f880614be58a2b39a2b Mon Sep 17 00:00:00 2001 -From: maechler -Date: Mon, 30 Mar 2020 19:15:59 +0000 -Subject: [PATCH] no longer fail in norm() check for broken OpenBLAS Lapack - 3.9.0 - -git-svn-id: https://svn.r-project.org/R/trunk@78112 00db46b3-68df-0310-9c12-caf00c1e9a41 ---- - tests/reg-tests-1d.R | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R -index 6b7de765a95..fafd6911e7a 100644 ---- a/tests/reg-tests-1d.R -+++ b/tests/reg-tests-1d.R -@@ -3836,7 +3836,8 @@ stopifnot(is.na( norm(diag(c(1, NA)), "2") )) - ## norm(, "F") - (m <- cbind(0, c(NA, 0), 0:-1)) - nTypes <- eval(formals(base::norm)$type) # "O" "I" "F" "M" "2" --stopifnot(is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN -+print( # stopifnot( -- for now, as Lapack is still broken in some OpenBLAS -- FIXME -+ is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN - ## "F" gave non-NA with LAPACK 3.9.0, before our patch in R-devel and R-patched - - From 4769e7a3916070662186561c310f873cb4e370f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 22:27:07 +0000 Subject: [PATCH 011/234] imlib2: 1.7.1 -> 1.7.2 --- pkgs/development/libraries/imlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 23550bbc807..6be73c8da4b 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "sha256-AzpqY53LyOA/Zf8F5XBo5zRtUO4vL/8wS7kJWhsrxAc="; + sha256 = "sha256-Ul1OMYknRxveRSB4bcJVC1mriFM4SNstdcYPW05YIaE="; }; buildInputs = [ From a4ca45acd7e4fe6fb65e2c32e8961a6e24ac7b47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 29 Jul 2021 16:33:10 +0200 Subject: [PATCH 012/234] nginx: add listenAddresses This allows the user to manually specify the addresses nginx shoud listen on, while still having the convinience to use the *SSL options and have the ports automatically applied --- .../services/web-servers/nginx/default.nix | 14 +++++++------- .../web-servers/nginx/vhost-options.nix | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index ebb3c38d6c2..72e7aa5b8eb 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -230,13 +230,13 @@ let defaultListen = if vhost.listen != [] then vhost.listen - else optionals (hasSSL || vhost.rejectSSL) ( - singleton { addr = "0.0.0.0"; port = 443; ssl = true; } - ++ optional enableIPv6 { addr = "[::]"; port = 443; ssl = true; } - ) ++ optionals (!onlySSL) ( - singleton { addr = "0.0.0.0"; port = 80; ssl = false; } - ++ optional enableIPv6 { addr = "[::]"; port = 80; ssl = false; } - ); + else + let addrs = if vhost.listenAddresses != [] then vhost.listenAddreses else ( + [ "0.0.0.0" ] ++ optional enableIPv6 "[::0]" + ); + in + optionals (hasSSL || vhost.rejectSSL) (map (addr: { inherit addr; port = 443; ssl = true; }) addrs) + ++ optionals (!onlySSL) (map (addr: { inherit addr; port = 80; ssl = false; }) addrs); hostListen = if vhost.forceSSL diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index bc18bcaa7b3..77610a5732a 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -43,9 +43,26 @@ with lib; IPv6 addresses must be enclosed in square brackets. Note: this option overrides addSSL and onlySSL. + + If you only want to set the addresses manually and not + the ports, take a look at listenAddresses ''; }; + listenAddresses = mkOption { + type = with types; listOf str; + + description = '' + Listen addresses for this virtual host. + Compared to listen this only sets the addreses + and the ports are choosen automatically. + + Note: This option overrides enableIPv6 + ''; + default = []; + example = [ "127.0.0.1" "::1" ]; + }; + enableACME = mkOption { type = types.bool; default = false; From 7217514bef57daaa7bdec4b8f9df8ac16ebc5e56 Mon Sep 17 00:00:00 2001 From: Hentioe Date: Mon, 2 Aug 2021 17:00:37 +0800 Subject: [PATCH 013/234] ffmpeg-full: enable libsmbclient --- pkgs/development/libraries/ffmpeg-full/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 432fcdff937..3dca11008f7 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -406,6 +406,7 @@ stdenv.mkDerivation rec { (enableFeature (zlib != null) "zlib") (enableFeature (isLinux && vulkan-loader != null) "vulkan") (enableFeature (isLinux && vulkan-loader != null && glslang != null) "libglslang") + (enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient") #(enableFeature (zvbi != null && gplLicensing) "libzvbi") /* * Developer flags From cb8424f8b24f951eac5c392fe357bec14db97e14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 14:44:16 +0000 Subject: [PATCH 014/234] catch2: 2.13.4 -> 2.13.7 --- pkgs/development/libraries/catch2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 34d61a519ab..5adcc2d1dd9 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.13.4"; + version = "2.13.7"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="sha256-8tR8MCFYK5XXtJQaIuZ59PJ3h3UYbfXKkaOfcBRt1Xo="; + sha256="sha256-NhZ8Hh7dka7KggEKKZyEbIZahuuTYeCT7cYYSUvkPzI="; }; nativeBuildInputs = [ cmake ]; From 47f6591706dcfb699b0e0d9f09a5a10648198d40 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 Aug 2021 01:38:54 +0300 Subject: [PATCH 015/234] nixos/gdm: disable the gdm services as it is redundant and causes issues --- nixos/modules/services/x11/display-managers/gdm.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index ef9ec438cc1..0f7941364d2 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -164,6 +164,11 @@ in systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ]; environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ]; + # We dont use the upstream gdm service + # it has to be disabled since the gdm package has it + # https://github.com/NixOS/nixpkgs/issues/108672 + systemd.services.gdm.enable = false; + systemd.services.display-manager.wants = [ # Because sd_login_monitor_new requires /run/systemd/machines "systemd-machined.service" From 3860143457ac5d79beaa1d2e77cbf8d9e7257939 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 02:05:47 +0000 Subject: [PATCH 016/234] byacc: 20210802 -> 20210808 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 1b1b31deaed..6dbec5cfa9b 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20210802"; + version = "20210808"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "sha256-KUnGftE71nkX8Mm8yFx22ZowkNIRBep2cqh6NQLjzPY="; + sha256 = "sha256-87Dt1YSkJtoO4WduTtdITmL3d8MeozrPTInWXjLHXOo="; }; configureFlags = [ From ead9fb43902649cda653c9d5af1f3f9f03c2ad6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 02:58:51 +0000 Subject: [PATCH 017/234] libsForQt5.drumstick: 2.2.1 -> 2.3.1 --- pkgs/development/libraries/drumstick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index ba3768227f3..36f2ecd84be 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UxXUEkO5qXPIjw99BdkAspikR9Nlu32clf28cTyf+W4="; + sha256 = "sha256-0DUFmL8sifxbC782CYT4eoe4m1kq8T1tEs3YNy8iQuc="; }; patches = [ From edb14bad6a6fb0c6457226d246a0c42a1ed2e9a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 06:28:00 +0000 Subject: [PATCH 018/234] fwts: 20.11.00 -> 21.07.00 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index d937d4b75f6..1c68793fae0 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.11.00"; + version = "21.07.00"; src = fetchzip { url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "0s8iz6c9qhyndcsjscs3qail2mzfywpbiys1x232igm5kl089vvr"; + sha256 = "sha256-cTm8R7sUJk5aTjXvsxfBXX0J/ehVoqo43ILZ6VqaPTI="; stripRoot = false; }; From 2276a630d10e47b6ec6c57015c327dd44908b5f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 08:04:34 +0000 Subject: [PATCH 019/234] gnunet: 0.14.1 -> 0.15.0 --- pkgs/applications/networking/p2p/gnunet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index c1ba42a5e6d..fb1abae6bf3 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.14.1"; + version = "0.15.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "1hhqv994akymf4s593mc1wpsjy6hccd0zbdim3qmc1y3f32hacja"; + sha256 = "sha256-zKI9b7QIkKXrLMrkuPfnTI5OhNP8ovQZ13XLSljdmmc="; }; enableParallelBuilding = true; From 445f8c544cb9216d09f04863e211115f3177fc1b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 10 Aug 2021 11:34:49 -0500 Subject: [PATCH 020/234] zoom-us: Do not apply screen scaling twice --- .../networking/instant-messengers/zoom-us/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 82eecf17cf8..81a69d2615d 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -101,12 +101,13 @@ stdenv.mkDerivation rec { rm $out/bin/zoom # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm: - # Also clear Qt environment variables to prevent - # zoom from tripping over "foreign" Qt ressources. + # Clear Qt paths to prevent tripping over "foreign" Qt resources. + # Clear Qt screen scaling settings to prevent over-scaling. makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \ --run "cd $out/opt/zoom" \ --unset QML2_IMPORT_PATH \ --unset QT_PLUGIN_PATH \ + --unset QT_SCREEN_SCALE_FACTORS \ --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \ --prefix LD_LIBRARY_PATH ":" ${libs} From bc0ec9d2fff9ccaacf5f45db1651d38f6f2bbbc0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 17:37:59 +0000 Subject: [PATCH 021/234] bobcat: 5.05.00 -> 5.09.01 --- pkgs/development/libraries/bobcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 06c7ac81dcd..d0d0720f20c 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "bobcat"; - version = "5.05.00"; + version = "5.09.01"; src = fetchFromGitLab { - sha256 = "sha256:14lvxzkxmkk54s97ah996m6s1wbw1g3iwawbhsf8qw7sf75vlp1h"; + sha256 = "sha256-kaz15mNn/bq1HUknUJqXoLYxPRPX4w340sv9be0M+kQ="; domain = "gitlab.com"; rev = version; repo = "bobcat"; From 13a68b47c4d36d38b692b1f3ed6cf28bbdabd74f Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 11 Aug 2021 03:12:26 +0900 Subject: [PATCH 022/234] thunderbird: 78.12.0 -> 78.13.0 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 7b74cdc0208..a5a8ab861ed 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -74,13 +74,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.12.0"; + version = "78.13.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "8a9275f6a454b16215e9440d8b68926e56221dbb416f77ea0cd0a42853bdd26f35514e792564879c387271bd43d8ee966577f133f8ae7781f43e8bec9ab78696"; + "daee9ea9e57bdfce231a35029807f279a06f8790d71efc8998c78eb42d99a93cf98623170947df99202da038f949ba9111a7ff7adbd43c161794deb6791370a0"; }; nativeBuildInputs = [ From e87237b4be4dc050c2160102c45375fa2cef45e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 18:25:25 +0000 Subject: [PATCH 023/234] apacheHttpdPackages.mod_wsgi: 4.7.1 -> 4.9.0 --- pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 7f28abe8840..6a029ce1dcc 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mod_wsgi"; - version = "4.7.1"; + version = "4.9.0"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "0dbxhrp3x689ccrhvm2lw2icmmj8i4p86z2lq3xn1zlsf43fax16"; + sha256 = "sha256-Cm84CvhUuFoxUeVKPDO1IMSm4hqZvK165d37/jGnS1A="; }; buildInputs = [ apacheHttpd python ncurses ]; From df5e0bb678875e1b10f2e2e59399630b2db2dc89 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 11 Aug 2021 13:55:53 +0900 Subject: [PATCH 024/234] thunderbird-bin: fix parameter of updateScript --- .../networking/mailreaders/thunderbird-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 5b03f893b4b..a2be79f5589 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation { passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { inherit writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; - name = "thunderbird-bin-${version}"; + pname = "thunderbird-bin"; baseName = "thunderbird"; channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; From 676a38befc0d9162a8c9c35c3bd2372b89cf5678 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 11 Aug 2021 13:56:41 +0900 Subject: [PATCH 025/234] thunderbird-bin: 78.12.0 -> 78.13.0 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 4b9e47aef5b..3de7ea1bb62 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.12.0"; + version = "78.13.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/af/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/af/thunderbird-78.13.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "39671f52392f2c10c7398376047e01d85c42ca8eb21d2c536e11fa575cca4874"; + sha256 = "f08190514cb9e7a429e12db93b5423e83f8c4f8b34079e266b797099d6e5b3cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ar/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ar/thunderbird-78.13.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b3ac3c166b5eec0ae3857a89817a0a7088dddd5545aa4864705caf79aa8bae1a"; + sha256 = "cafc6a55a1bd4b1ed0c412cdcce917d803f1d81689a496e09ffd702bf1495c8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ast/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ast/thunderbird-78.13.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2a98210aef008bd04206eb4019d9b6d0301e21085d8c96e5d8f023c77b079900"; + sha256 = "b444e1b6cc64b28069382e97f8b966f6d154fbc4216cc67b20ce0105ebd0be89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/be/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/be/thunderbird-78.13.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "6309d4959ebcc9be6d139277f990562f8d912766d57d64fc3ec4078e214097cc"; + sha256 = "18ef49bc393dfc223638edb54525a336f604c606c36f40e3c0f6e4a883cbb1d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/bg/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/bg/thunderbird-78.13.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "20fd0b411962c3ed0da4f6eb95d8c47dc57a7b366dee0e771708c2c67772619f"; + sha256 = "2fe1b34fbb43e22f8fb7238baca4aa2d5d5df3dbf4baf0aa276fc8bd0dd5bc02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/br/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/br/thunderbird-78.13.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e9f43ff375066cbb23340f2138c0ebf7b2c18e0a57d7049437034a580d8ebc74"; + sha256 = "e1a46004fefb79e3febf8bcd2b8aa6aa7140b97170740c4b5cc4b6351cb1fd6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ca/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ca/thunderbird-78.13.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "2eaf6674ea616116457b7100b90f2b813eab906091a53bce71d52f4bdae17fb9"; + sha256 = "d7e9112b78155af6e684f9f306e35fb7aa8862f2008aa842729aedf10e5b62ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/cak/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cak/thunderbird-78.13.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f56dc013fad49782a074ef7d0721a12f43af5f029e690937d72e6a14d79c1505"; + sha256 = "325acc4638890583fcd2483846cce33a4ed9a2fb376265c926bb8904e37cb6cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/cs/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cs/thunderbird-78.13.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "87fecc8661be9ee8891b74f83bd9a6746b826700a6ac46b550d5e2bcc93e560e"; + sha256 = "a9926717859e51e5f66c41c0a11a70e8d4e635b8dae3486f454ad24464ad1e80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/cy/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cy/thunderbird-78.13.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4177b225e02341b96baa6528f1053c718e2e85d452b730a40ebf124a4c70d118"; + sha256 = "e8d6edb4ba1b6749517ef5d4ae3300aed654c3aa9d6a6e6d7f4a0ff6c829d139"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/da/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/da/thunderbird-78.13.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "9d8cb26a9011130ce973e9e7ecd20650296d406b7ce8b4cf8740ab7e9759e641"; + sha256 = "ab5288a8d809f9979eb3a330ec0cd8bb4c5deab564b755f064470fe13df3d0be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/de/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/de/thunderbird-78.13.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ee19d3702cd0fc0b193e09a3fc470c450ddc919d78471df071183c89c063f443"; + sha256 = "9a477fe13a4a99fc48fae4713b82771ecca367869047ef268d8811dac1aac220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/dsb/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/dsb/thunderbird-78.13.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "20d78a72fb2c5d91e2534dd21aa00d9f958d2df61bec297e1662d7f594c76a5e"; + sha256 = "deb4947364fd806e06b5c69ea4b51b411b9cd10bec92a23d6d7432d8ba0bbdf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/el/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/el/thunderbird-78.13.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c5014ec8b8382814e3184839192aa71e5610c8c0a6df8dfc9b6b596afbd22bcb"; + sha256 = "18cc09ee14827e4a3f155215a11551791e5708106ae0d993145ccce4890d8cf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/en-CA/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-CA/thunderbird-78.13.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "79f1c4166607a01cb32eec5ddb60892822f9047f43c7af3cdeb877ba9c7b7584"; + sha256 = "6afd716eeae087a27a8c75029735e501fd7e32f95a8842bc5ba0e3a64cb31630"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/en-GB/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-GB/thunderbird-78.13.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8dfe9daac9224dd4c64d689b7b066c126f72e75f283d8a66dcf3fa846e46c881"; + sha256 = "91e0ad90be9e4e89f5245e660e09c3ad06d1ff807a30b3eb696261a883ea77ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/en-US/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-US/thunderbird-78.13.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "43c021edf529f388856432315d99fd1261a0034aa1cead97cc104598eba63d7e"; + sha256 = "97515bda6e141aef0d74696db3459711985f7fb526ca0e2d7544725d72f5fb3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/es-AR/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/es-AR/thunderbird-78.13.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "5f6f86557456d717790a16053e663dce8878a4e7b60f4ee15d02ae753b5c8e78"; + sha256 = "ef6067e00544e37786694d85957c0fbdf12bb20add6f6f5dadc03b095d24513d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/es-ES/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/es-ES/thunderbird-78.13.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f6e85e580871e225e5315eeb0aa7f2982f43352c6c4065966ead1eff47037989"; + sha256 = "be6df6fa4ed5facfb77a5849e0a4008ec42c2629deb5ea2dc3fa5251891e0306"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/et/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/et/thunderbird-78.13.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "37ea60b93f1d57a1c5f30acdc93dcd73a35ab7107dc05b8e8eebe3a996454186"; + sha256 = "6c63ddb05366d3a9d0baadceccb3aac8fe3c6788515feeb2649bdc5d717d6d0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/eu/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/eu/thunderbird-78.13.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9f7a1fc4b94017d6341c993209987e9647bf29973c3ffc3427ece6277cf92c5a"; + sha256 = "215861f41e59b6e9c5892e9b10483b890a7a4c351376c455001215af4c3bf276"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fa/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fa/thunderbird-78.13.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "dc36f3eb91e32ea44a30792f8d65ed225455567ec4b7ec386fe6ec6510caa5da"; + sha256 = "6486a7b0923d5b689e15eb2082317127e62f050d68f887dbe410619f5c36a470"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fi/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fi/thunderbird-78.13.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "1fa2cfe9354f7a5b4c9aa0927ae83cad535e8cb448d8a2d82f7a946b5c142b22"; + sha256 = "5e6a55e1520174f9cd27a82e3634999df0703f8bbdee82fdec433f862c41daaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fr/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fr/thunderbird-78.13.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "49887ce333f50f404a383291d813e3e8f891045247d2de353627998c47821a12"; + sha256 = "7c9573fbf4a0d16e89a9f8d8fae71874cf49577b3749ba942ecb71b1b6a3a8d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fy-NL/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fy-NL/thunderbird-78.13.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e408da5478ea01797c260b414ff513e87e71c6de41d6ca0c8bc11780c06fad28"; + sha256 = "6ff1fe09e82b723ebc7022744bba0cd064da2fcc7b8b92fc23475bbbea57c0fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ga-IE/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ga-IE/thunderbird-78.13.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6dc99c43a076c4575163e640260b27aaebef01ffcc1ce8b6c6e2da8c993eee72"; + sha256 = "be25c020f47cf42c05dfd33338b210ad603ede6af97f8b41528d8a18be209fe3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/gd/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/gd/thunderbird-78.13.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3ba9424491565e4e576dbfe656e681892ff1084fcd8b9659beb6a17b36cc4c27"; + sha256 = "65cd07e5151809ae64a905163c939bfdef60226b4fe24b9657f6de3a2c10eaa6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/gl/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/gl/thunderbird-78.13.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a8348d99ba729122d2d2cc0a10d60c38ff4b7e83eaf7ebd04a58d7fad5326664"; + sha256 = "882ed57366537562882a5e7822789a7b16d6161b8a68e7292d86741d9c3f4b95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/he/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/he/thunderbird-78.13.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "fcba79332eeba50f074a7f1864120414ca20152a16b4b9aed02dbc05d487cf10"; + sha256 = "115e4cb00d50dd7c5c42e94a432b04e4ac6129e1409c5b5c578594917a1b60d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hr/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hr/thunderbird-78.13.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "d6a51f6c92ab53a73abb5733a9737d36f59aee7acd248ea656b7aa3c406e3980"; + sha256 = "325cfc1ea9f0a8cb8bd3cb7c881e1bd84a8d8813b78618dcdc7b1ca7b4647b30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hsb/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hsb/thunderbird-78.13.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a99dbdd453d31674178faecf37e61b414cc24468a39b8a5e5afa037bf938ffd7"; + sha256 = "c92d6bd04f71dc7379c3777186d094706ea41ad6a3e1fefa515d0a2316c7735d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hu/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hu/thunderbird-78.13.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "aa8384952169ea4f60c8bb11d47c39b81a9c327546ceacdefedb1a37a91e80b0"; + sha256 = "ee0ab2733affbbd7f23589f1e07399ef73fd3c8901463085a67d6c9a3f6e5302"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hy-AM/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hy-AM/thunderbird-78.13.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "2a3fd50c42b1aeea61e921e70f05c4ca74e03904c8400b7fa0e245816e42e0f9"; + sha256 = "fa5b38c93c4777046213b00e6162a7afe14cafb1a3fec47383f54a9fd11a440b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/id/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/id/thunderbird-78.13.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5b606b68a3f618ca0d3fadc5a8ee1da7aa636b6d1c1aee0b3e46c978c4a95ef3"; + sha256 = "a5602d079dd6ae9edbd5b1461474d858085c3250edb33573afd7f4ea2b232176"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/is/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/is/thunderbird-78.13.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "af75f627fc5eb5c0628bbc3ece9549c0daf967e267de850503314830384b340c"; + sha256 = "eed6de442870f9c4933bef7e94019bbc386465ba5f7f2baa26de2b79973fa567"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/it/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/it/thunderbird-78.13.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "de55f082a0de2c6a3f5c04e6a3bc00f4dd79dc4c8c91d7218bbc50c5e31421a4"; + sha256 = "960c1552022ea30da269981d986b5715c971438e5d379d74fde59f18d033d862"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ja/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ja/thunderbird-78.13.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5db89a1ef3e1546ac48e870c06a235e2f525a9634fed09ce706773cf2582c15b"; + sha256 = "0a13ffba546db10ff44ff5c5db7d17813febdf557b8aea7d7399b6987806e8da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ka/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ka/thunderbird-78.13.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "524d9508d2b8ee337658d5538f9b290e08f0df9ef0c7ed0da9dc5e1e8dc2a9de"; + sha256 = "42b41113b2886cc35afe5ed48026d503519e8c318efad6123f5e074caa8ca425"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/kab/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/kab/thunderbird-78.13.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "7dd3d55f7a5b68b0ebaa96efb2091c320553bbee17b0329dce2ffdb5bed0954c"; + sha256 = "17f0fdf3f2697256052335808a6ad1ef81d97fc94f848c29df9e717a3e63fba8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/kk/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/kk/thunderbird-78.13.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f49fe966e1f22e542b62f7e2f3aa8a7377ec6997d5d0b3dc8f0e6986e0418111"; + sha256 = "94956589eeaaf7c9dd3c3c5c004907f33d6ee515d1202dad8f651cfbd1726638"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ko/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ko/thunderbird-78.13.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f48b05376ce85123a163ec54be9baa1325e38e1994753696a3054028a6f60ab2"; + sha256 = "0a7efb01da1befb18111c117d2ed4c69e52de0b3f3aa24e6e3e2d0356bf645d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/lt/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/lt/thunderbird-78.13.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "124b0f6e6f1db1cac8ac33f0878d8583c29913c65fb5ca1be4653a9592967407"; + sha256 = "810dae8617107773cc0d0de4ed7cc4fad42282edcea81fb2b6419777d7386bae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ms/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ms/thunderbird-78.13.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c2917bf55feb4c9efa905920add0bea79b715dc631960e283cb413d05e1e51ec"; + sha256 = "ae4fdae5ca5a07e3f1b9fdd3b9eaff1cd1d8448eefb0b67cde16124514f075a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/nb-NO/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nb-NO/thunderbird-78.13.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "1a5f059665aacea4f12f0f604979bc6de5059e50ab85710cf25d6f0478fd1acb"; + sha256 = "ce73218100a0153fee49edaedc78910cfda0784ebf59ec90847b7718eb108b73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/nl/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nl/thunderbird-78.13.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4efc6479b4948aa96e4c4a14f25ca6401058ddfea4b4175cdce851839327dd8e"; + sha256 = "63e23bba6301b86da1df350e87d107c53bc04b5eaf54c36bb57e0140b79a1479"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/nn-NO/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nn-NO/thunderbird-78.13.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "910661eecc2d65c27f63597ed5bdc96973e39603a0c702e7dd760e87b373d7c8"; + sha256 = "287efd5bc94297448895121c8df4fe43beaf39850ce8a82cda31d9a89a4d7b62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pa-IN/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pa-IN/thunderbird-78.13.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "50aa0006b3252d7ba020a162b36f863c632fb3f6d13bf0589334ba3f34ae6ba4"; + sha256 = "7079c15ce806ba3cb20bb50b6c36004ffa745ac083f514b2ac5b5dece95eef89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pl/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pl/thunderbird-78.13.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "6f75b4492c9cf6bd3b03800a55b0e91a121e7e13ca1f451571cf25abde040487"; + sha256 = "30048a59149c8ca6b9d240140826b61a777752dafa221c47738d291c51e70ccd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pt-BR/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pt-BR/thunderbird-78.13.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ed8834d038affbd7fadc93dbb72d972a7dca77d9d9af4b5cbdb0cf4c36bd7b70"; + sha256 = "38cf30326280109a1f08de860ac1045c78b27a1dc851a7972e03e8c8d07bf6b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pt-PT/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pt-PT/thunderbird-78.13.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6add8c6de555561d892b23909e5b4828230567789f71467600483c8eb0f4e6d1"; + sha256 = "ef892e822f76b00b06f088335f736552cd7c864212eadfdf4afcd4e6a7eba2dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/rm/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/rm/thunderbird-78.13.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c9ceb44aea4f61d4376d2519b233356ca48ab7eed6c62e0402c1c435baac379c"; + sha256 = "c19dc84c5437b1126ab568a5be2c5256403511cb2624c4d5ff253f5579cdd2ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ro/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ro/thunderbird-78.13.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "5d2889df62325331b5869e17af8125179ff9371c8860ad52b4cc8d4c21253e6e"; + sha256 = "263d6cfc4efd27849017ae3f13849f6e5be0bd7dd6a9964b6716a948705beb20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ru/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ru/thunderbird-78.13.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "07aeda5b10bcdca5474ef156be35c38ebd15de68a3670e4e2532b045964d7164"; + sha256 = "425b1544350335e5a15dc8dfe2525c6c3143e34377bb9bbfb25f9b1a688b202a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/si/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/si/thunderbird-78.13.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "a70410319bcab48a407f4b379e82029528b8998ec89d7105a85ffce5e804a285"; + sha256 = "bc506ac571d49e70e330ccbfd62c566985754c7b98f8b484209128ab173a6b08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sk/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sk/thunderbird-78.13.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4b110a5b7d3cab0a9145635c0e458e22eddddd97e407a229d8c8a5f5761d150d"; + sha256 = "46b479e0085402f43446bd003ff4b9c014e888b4eec0cbcdcdf9336893ffc967"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sl/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sl/thunderbird-78.13.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d253ee57d3eac036b1b758d45609db39b47dae05e282ccaace739993ef3cfccc"; + sha256 = "a8a70d172e8d5890394f9974208de1cf422290b6fd8e5629a31b2f7706eaaa35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sq/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sq/thunderbird-78.13.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "700a8e7798f8b92c6874febd71b188ab0a97a2ca62930db4cb36fb12e02cefe8"; + sha256 = "f26287b10e906805984b0beb4ea6890bfb62a82ae8138bd26b7a5febc628be7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sr/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sr/thunderbird-78.13.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5485ce5280b71f9adc8ae2a544eecb8c8a12720efd604d93d5f2bf051f3edc0d"; + sha256 = "20fc984078efae2ddcbbe7dbd81238a79342a7fe7d1f8736594c1fb290104ed0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sv-SE/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sv-SE/thunderbird-78.13.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a3d0f4d3d32ebb2ec9b67fcbbbabf5640b714fbcd01a742c7cabd872c5bd94f4"; + sha256 = "ea67fdba6f8f3825ed1637fd7f73b9f8159c519de3920165ae58052b351c0936"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/th/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/th/thunderbird-78.13.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2d6963ec130e14f5d0721782d5a4f724eaac5bab1b4e3469e19dbbdf1512396d"; + sha256 = "86f069a0a4ef2e5338754e3a5de369a25b0d8fe96b3b7047dbfd009171e8fcf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/tr/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/tr/thunderbird-78.13.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b6ada3486cbba66992db5a04138f03f12ac6fc004cb86558a4b8787481f39383"; + sha256 = "9e975e5d8493a7f2b4dab36b5719b5a80c239820cd7d1adddb83440e9560d810"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/uk/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/uk/thunderbird-78.13.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c24fa7aab502cfdb88703c0abe2444cfd1bc7b94cab1f34b0626240c2a75a8cb"; + sha256 = "a0d14c98ee3534d7eb7f0098d0fd7b8f64b4c70d5bc0bd78ea695b42babefa17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/uz/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/uz/thunderbird-78.13.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "119d29856eb9656d89b5d06301f3abef4db106ddf3793dc0b9c0c7f2cb03428c"; + sha256 = "e7d1e5b0b6a72d8b0e3611f1d4f245c46222148c1f69805a15057a85cccda9dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/vi/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/vi/thunderbird-78.13.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4aa063fd673684488c9565ca7f35b8b6aa2c944cec921131de8ac2dd483b5b8c"; + sha256 = "67a733ec644060ca58673dccf1e4e534bb1e17f7f40e0c248e6f666450ad8b07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/zh-CN/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/zh-CN/thunderbird-78.13.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "78fd8d25250632336c574b4d02a9c397d2a01d91660a17a3dedc98155cce84d1"; + sha256 = "324c6f5c203b9ecc050bce51cf657785c7129251130efbe9f216540bbd32438c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/zh-TW/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/zh-TW/thunderbird-78.13.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "724451f25a3e45cc23a277c4d1bf3ce76457d883d43b5a5f172340e6d8e81f41"; + sha256 = "e2df519a3fdfe586edac6ffb9496637df8d6ab3ba93c51c7ee979cd4b901a1e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/af/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/af/thunderbird-78.13.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "6ee9ef2596d099bed0962199cf95bae3f8ce322cbc2d9d78195c1caa661297d2"; + sha256 = "1228035980663d4712877ccbef838522ce8e7c80d04598bc37f42972f6b01b12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ar/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ar/thunderbird-78.13.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "dfa41ea4a15f074b2530b8e8383b76617e1a916344567e30dcc370660f0ab05a"; + sha256 = "1b4950bc1227ae4e38da2db53a381609eb836afb4ee14dd23e7f1d93db58718d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ast/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ast/thunderbird-78.13.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "602d1ee72a11a88004236572cb2fa22fdd86cbda81a74f89342e8371a295a140"; + sha256 = "ad399d8ec5e48ee79470018df8db138791e4207156f3f7c818d24a9688b83ae4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/be/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/be/thunderbird-78.13.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "1e7d385da89801d9a949fef16de5904314e6e012a2693a936c122e9b8276b267"; + sha256 = "00c324154a4d2cfcd1399dec6dea9d60812c89ffb7fa7d8ad0caa699a2826f9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/bg/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/bg/thunderbird-78.13.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e8c52029a88272d3371c42cdab8d8fd97d8a816032377d22285154686a557f08"; + sha256 = "f3b88a019536ca8446600d5f5b35ce5d35d5dc483ae63437d2ee0ed9a8696426"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/br/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/br/thunderbird-78.13.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "49d0c56d04033da26b9e73cce83e7de55755b269e2c15003537c2cc53d1e57c1"; + sha256 = "d76b6774e0ca7e25687fe25936f81e80167dca6b7ef1a2cd1248be71e2bb3abd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ca/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ca/thunderbird-78.13.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c31cc0421858f4a31840d6924882ed692db260e66c16b4c916d82e2eb07ec229"; + sha256 = "d1a0da69ebf33a8d96110133fe91fd7799e95f303b55aec750d8a3b5ad395e49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/cak/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cak/thunderbird-78.13.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "5be14239cea98b350a05230efb5e15dbac7bb530f1c3f2b7f17c12b0d2ff75ba"; + sha256 = "b61a9548b72fdf5e3211cf238129a17df3d8b3fdf76da3aa06cf83ff9ba43b7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/cs/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cs/thunderbird-78.13.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "51260bbdeebf1cc18b7d36ad2a302841b29eee797d096ef033b5be03162177ad"; + sha256 = "605b02fcbc6b1aafa261cbad5aa12d85342f9f9d9458b4a154ee23bbbc91d49b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/cy/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cy/thunderbird-78.13.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8c6e1fce7834da9a3a820bcb9df6a27f77c132f0c513ed074c24af9de8858798"; + sha256 = "af5bf08dd943334629f60fe139392dfc957bae073bc50ec4e10bdace08b2fe1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/da/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/da/thunderbird-78.13.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "fabc99558863a646565eff20badf08805e2460e541a3907fab9c6b029dadc0de"; + sha256 = "ac1e4082bc78248ca1dc8760cf71901fc0e0e537b92e7dadb9af5ac9c80c49f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/de/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/de/thunderbird-78.13.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "dc6d7c639e6e9b3ef9f4c13054ec543ed1ec6d789ae2c5e0fce5650c7fa7932b"; + sha256 = "a26ba23ae9eeaeba09d2a9fbb4fecbe87e6b5662488d7c0dded0fee89cbb5107"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/dsb/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/dsb/thunderbird-78.13.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "86edac99d1e2a8da228718f2fd78448948e207e3398f781ddec43d4c9ac9e425"; + sha256 = "775d9f85cc392e2c219e2c19800d4fba8aba1762e1c7b3a2f328dc61925b9638"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/el/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/el/thunderbird-78.13.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "0113409e306300aa4bbc9dacdd85ca52e5d71ca52962ff4628a96c4103337a1b"; + sha256 = "d11d1c2b09d8f9e55dee43e19d64157cf040865729eb2986dbe8aeca8fabfa6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/en-CA/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-CA/thunderbird-78.13.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "1e792a76d371479abd43bdfb993cada3b23fbb547cfadf691b25f51cacf4265e"; + sha256 = "14691fa34a7ced54eec6a7485a5258af4934e0f07cc612588698e88fd624a07a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/en-GB/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-GB/thunderbird-78.13.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "596ccfcaee2a005ea2ee0a93f9644666a5e7e955e22b799bf91766908dac7db9"; + sha256 = "919b63cd0018df0913d9f230d36e5d8124bef5afe9d224072eaa1d40dc45fa28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/en-US/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-US/thunderbird-78.13.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "97fcb2332b1343f9b5e06efff7ea5a73c80212512ac2b2959537d1e255a8ce44"; + sha256 = "1fc8e76d7840ec8fccdabe4765e72555e75e027d47359e7a3f2fb092a30d2673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/es-AR/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/es-AR/thunderbird-78.13.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "0af5917c4828c08425709f0fc3aca7c74668ece53721666d6e4004b637469b17"; + sha256 = "0c38fe5f220b3ed9f096c026e05ebfb195bf6c545e2041fd5d1f84e95bc2c238"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/es-ES/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/es-ES/thunderbird-78.13.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6283c85e34f6ab7d25fdebb5ed70b1d26c601b3416cef45cc8f06a15e723d9b7"; + sha256 = "db0dcd82200922451b79a00ad7660ad2e1df6a2abb84ea4ff7ebdc73a751c068"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/et/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/et/thunderbird-78.13.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "ab1cefeb07ead51998a7f54befb0a291c065d8a0d440a6d2c7972fa64f345948"; + sha256 = "a3c802a85f607d85c97e955c45ba4e35842da4bc5bebc6dd43407c6aea546d65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/eu/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/eu/thunderbird-78.13.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f4ce3787e3cd46c8bcadbc6ab2a728e3b76ee2556ad5e4129e4418e844a8c4e6"; + sha256 = "3bc5f4ceb596334fb9a570be31807898efe3684441fe9a9f96a28d16d4269864"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fa/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fa/thunderbird-78.13.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "35da798ea7f613489820e4e42b1c78c078c21ee7f7521ef5ba21a7602fb302ae"; + sha256 = "eba6a5b4bd14860d97a71c7eabcd893c733ae52ebc5e06c9e12afda86552d35a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fi/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fi/thunderbird-78.13.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "dd97b6c745b88a6493d280e5efc2165bc5895ec7ac56c1df63d7adcb860eec59"; + sha256 = "77d8335a6c5fb8e302cc5a4490f6248e51e555e5d5c428116557b0cb560f2b14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fr/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fr/thunderbird-78.13.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "9d49108417933e1f79a285b99cf0e49f6a009a121084148da70f4cf93a238c34"; + sha256 = "2fce215ad23039c43624e897353b8b696eff73281c0739050ca5621b1ad209c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fy-NL/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fy-NL/thunderbird-78.13.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "efe33dbc8d7c6347359d30c63034a3553720ac806c1754752b0649d91ce293a4"; + sha256 = "1c670d870e6e9cc1366467d0c0acfab98a83842442bcd3b7b2bb1d302c2cf331"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ga-IE/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ga-IE/thunderbird-78.13.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "c99c54902c522ec9472ed6ea4a85e6be9dd0e013a2835a38d90b4b77554c05dc"; + sha256 = "77207016b5cd5204c9dcf849ec099c5bdf3bee4d79ec8ecde2cf61dc6719fb8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/gd/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/gd/thunderbird-78.13.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "af46f3aa8480469783a625553688f7ef5ff00bdcd9be9c98af7d49f98e8cba7e"; + sha256 = "5ee8c00cd937b9e7c62b13c594db9138b9550ddefa0c38127f7636cdaea7e420"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/gl/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/gl/thunderbird-78.13.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bdf94938571db3959781b490fc74aaf1a48b42663b22ae32dfab97600772be0c"; + sha256 = "2fe3765c8dcbb2a281f7de1ae481a9f725c2df785552d840e1f65f922e94d42e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/he/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/he/thunderbird-78.13.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "1e9f6f580751bcf518813a123a0e1f2f66cee92110516867b4844bbcaa2fa67f"; + sha256 = "f63094c0bc5cdbdf0640d9281e52bcdbab517f3d72f84e4a01a120c148f39ea0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hr/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hr/thunderbird-78.13.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "a6727dce9ac4074ed5685086f224cc956eacf04b3aa54fc4b7d669e2d3a548e2"; + sha256 = "0740acd2e924fb424790a806e2fef66ad43cf53e43fbaa87ac984225616b6167"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hsb/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hsb/thunderbird-78.13.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "16f985d7c4520bd81bc1e5a8e939a2ce97e807ab0635625d38290b073defa79d"; + sha256 = "bf6d4d7230d55ec1ddb7fb9764fc182dc8468bf57663661ef7e87d0762080900"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hu/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hu/thunderbird-78.13.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "9e7c771cd0dfd8dd1b42721f9129d1fdd760c2d3f7bce407adec6c4f3e0fc955"; + sha256 = "a4d9f65e964787fba470c0a091edbe7a21e667ab80e1f7dd1fc76290230aa721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hy-AM/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hy-AM/thunderbird-78.13.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4a5878d9be7d0b60347a19c2533fe22ff0f02aeb5228070ecdc1bb5bd0ca5490"; + sha256 = "9718afe2417006bda611b12c42ed2dc74d397cbd6703d86ca758119535226d0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/id/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/id/thunderbird-78.13.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "80bb061ed6efa9396627bb05ef26247e92b49fe50787e04add488cc3c69c5304"; + sha256 = "d3b9d86bddb1ed6db4a4e6456d09295d057da47aed4ad23a95021f3a2aa38ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/is/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/is/thunderbird-78.13.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4d96a6de273846f133a307967e4d96f6594c8f4fdd6c16efd39f10bd5121cf60"; + sha256 = "e2dc5cf9120dcaa54516393b9b14659b24a43a86809b3113724cc0480dad7a71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/it/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/it/thunderbird-78.13.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "f10c633cd2ab40a4845fe7c681094bbe18b2d0240c10d77ab2e47c633e10baaf"; + sha256 = "66c24020386335156d2659f70570f798982f2cf36014fbb8b866f1e3870b9dcb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ja/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ja/thunderbird-78.13.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b97a41e3e48c29f60aa22e9ce98bb4bab641ba633877d3086e92d1904bc7e34a"; + sha256 = "ece2f1660ef41a31ae4116a32b9b025547a419fcbd8612d1a36d9bc0b9e821af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ka/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ka/thunderbird-78.13.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c2a0bdf08c8ae9f5ca5df56eef07331834d52d4d8fefbe87e3f5f7bd31f83457"; + sha256 = "b549016df313c46518ee50c03b7f075c78feefeaadfd5a5c0ec2508d0607d999"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/kab/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/kab/thunderbird-78.13.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "4475c84a76bf254c6126384c15bb9721750cb935b2ab49b4825bc1d2c9552cc4"; + sha256 = "c56fe1f7051a47c05834a7378313b24fe8fdbbd816692dcaeefaf3635f09eab9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/kk/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/kk/thunderbird-78.13.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "5e74e269de716b9239dd45254d660679f8cacba3264aab7565be68c16143bf40"; + sha256 = "86594f4e1d92d495c76bbe20cadeb3bea74d5f57a4b3155edd01ff4f62c5f1a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ko/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ko/thunderbird-78.13.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b40047124044f3ba15f08526c1898f12d88e186f422202ce3aab1ee0f23cd0c7"; + sha256 = "47c8cb4a58643c56f005fa36b0790344546f5efad5446c2b5b49040906eb9339"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/lt/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/lt/thunderbird-78.13.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f7bb95f825b8aa20f40851fd0e99ac1574e26f2a5c69dd7bfdc2f865a11051b5"; + sha256 = "e3afe316e77d4c33e936574f32c3d477643b51fd0f0f228d52cce676c8ab4f82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ms/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ms/thunderbird-78.13.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "473ea13ae580d09237a04e08331d883eff6c419d61f0ba1afaa1c5a948da98b8"; + sha256 = "626dd1acb63356a2f531095833b0e697231009f5b0c51f401a17e8551b21a32d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/nb-NO/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nb-NO/thunderbird-78.13.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "efe8ac1e38a085caec95b817548c5cc06f45aac03bee5545cb65b93eb19efbf7"; + sha256 = "fe236ce5d719b3ac205f47ab4837ea3ad5d6f2817c44e2e562b0a011480a91ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/nl/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nl/thunderbird-78.13.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a646a84098185d299118305c651788bef0a88f805b08ff51bcc87067a5460c06"; + sha256 = "33fb2a46384f38e887575297ad495eaaea0ff0910b59cc05ea4512dd9498b9eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/nn-NO/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nn-NO/thunderbird-78.13.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "14b765aa23671318b6356886f3bee0847570158c4215e0d106bc823df045414b"; + sha256 = "5e724e31b26ae96a0b535495dd10b77c954a5a043e0353fd17962601ec042e3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pa-IN/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pa-IN/thunderbird-78.13.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ddc9dae4e4f7a9cd99d8e2e5041ac52432b6835f7b6e0867bc7ea2ff7283ba95"; + sha256 = "ee1db2f6e9000ff4ca6ba4fd4b758109ea0f94d066fad9c20020e75935f5fc05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pl/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pl/thunderbird-78.13.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "396373ad618f35be40c79f1e67ba67f1e72dbb2ee250459f610cc1ad2b7bd2c4"; + sha256 = "b09d9c4655b4c32b9554b83fdd2b2635586b9d8f669ec39f5722e7ac8175b79e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pt-BR/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pt-BR/thunderbird-78.13.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0e62406a68fc33d7c77b10c2ae427c508ee491e33041be114b03c4eb630e8003"; + sha256 = "f774513c0c23794c69112b962999512485beaa2a97517b06e335e4fce5b23d9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pt-PT/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pt-PT/thunderbird-78.13.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "ba8e89a5a15fe69660758a83e3801800d1a15ab051d8ee581dd1b97b6a67ddd0"; + sha256 = "39f0f2fd17ea216acc5383f3c65e4da8928d56e4b8bdf2d1bb76d6dfc8491ec1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/rm/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/rm/thunderbird-78.13.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "ac9705e6c64093d375db018116f66792eadef36fa32919bc467a0d08ed20fadc"; + sha256 = "3a966692544873281adf12a850ae904e1304ce08d8bd09ede0ad8b0cf66b5f09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ro/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ro/thunderbird-78.13.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4fdcb748d23044effd6fe4e94c525381e2dce3941c1829625c84eab795dc4797"; + sha256 = "4514976e0a5d433b64fc28e42f3baca52e871f7c99434e2993984dda9025b370"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ru/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ru/thunderbird-78.13.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "63f0d9be0baa91b3a65189ce9bee01d5984e04eba319484c69560cd10af750e9"; + sha256 = "97915e34bbbf036fbe8093bdf79a426181c57b78bd8d8b7f99b97fd1c3dceb7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/si/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/si/thunderbird-78.13.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "db371618474a3812c641d9518f04035c353c9e184b91f713d9b70f09b693f6d0"; + sha256 = "e27e823a4a6141141b92c2c1c55cd77e591d3e2b05d0fa6cc9502b4bc21e67a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sk/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sk/thunderbird-78.13.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "6b5370c99076c0955e3b3fb58be9649656fd12a32126a4bf2d54d51e9147c7c5"; + sha256 = "ff4d89bc1e0ae8d10dc8dcf377c4b3c45ab1db38c0489ca328e0a8f3145772c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sl/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sl/thunderbird-78.13.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5c5ef16ae617f18f4ad4774bda932d8858c35d6ef6e61a5bd1c730564193bedb"; + sha256 = "27d34b8508afa306d6ce94e73a2251071cf4480c5f55cc087597e56511e85173"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sq/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sq/thunderbird-78.13.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "e8462127bcfdfec2b651b11d569918e7ffff37c7ab0b556c10434273e59b43d9"; + sha256 = "3fb60c21d42ae9a961838081c12eea7e98e43a27ebc24ef7470e912bf13053ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sr/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sr/thunderbird-78.13.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9fe5e0091ebb9d3b0d07a6cc6dcb167b7608b0acc7ef5a5e24604e8d007001f5"; + sha256 = "dab84cca4db8412b3ce40690e7b31df1d66b06979cb39f4efd8206684a802edc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sv-SE/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sv-SE/thunderbird-78.13.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "1b6d4b29e53b933418ba25b8284d62d218076b1dde09006e0508a060190b81ca"; + sha256 = "cec350da20515ca0e5b317264e3969e1465e9d055de743c130c4011d5f3cc825"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/th/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/th/thunderbird-78.13.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "68a90653d02c8b9f022b52693884f5bce8d60bb89c5099784347dd9c9e578c87"; + sha256 = "0a8302af0995624d37c71757c851e8ba3ffdcbe89d90023c69c5f69a6ec888b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/tr/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/tr/thunderbird-78.13.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9776f2eceb7bfc15292d621d874a7fa3f092223752b81b65623a3294044022d0"; + sha256 = "8c7013e71cd57795f0bddc5061b24e43fcd5b1f23abc7c1653ad345869d73b24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/uk/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/uk/thunderbird-78.13.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "9c3dde23f775176780ff24d89d46659b293b22cee45df9a2dcf1bf3f8257c19c"; + sha256 = "ed9a30630c0821b515a2984257d6dc19410ca1f6a723e856bfe8758ad32b11f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/uz/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/uz/thunderbird-78.13.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b2d9d4b3e43fe3af5c602c4b429d4fb29461ace04498cf14b0f75fba7ea0c667"; + sha256 = "b834c2f59b3945a362d1ace0dd5b6275a1ba90587c8fcb894678a188301f3848"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/vi/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/vi/thunderbird-78.13.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c2c7a721d82ad59022020cad3dd152271a83207fbd0f61b91d3c464aed16bcaf"; + sha256 = "9f724e2c2e3faf0ad1d1ac6d08f8bc595ad16b408d7e712e3fc2f51b3d6f2a95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/zh-CN/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/zh-CN/thunderbird-78.13.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9e26860c8d78d13fffcc9eb418fb4d34a7da07b5604f8d01eddc10471e57dd70"; + sha256 = "7c8f7982d035bebf250542232d782834709becd60c766e6bd85a617bc6a443bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/zh-TW/thunderbird-78.12.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/zh-TW/thunderbird-78.13.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "403ab2f3262ce3e79d2261ca2afd8ddca98c116086dda620bbe54c45d2111632"; + sha256 = "a4c90eb3a5bf2fcd04b40b60e976accda049d10666e487f477c8d154c8928be5"; } ]; } From d37edcd3d5d764b2ac2b9b03835adf744dc596c9 Mon Sep 17 00:00:00 2001 From: Phil Dyer Date: Wed, 11 Aug 2021 16:41:53 +1000 Subject: [PATCH 026/234] R: 4.1.0 -> 4.1.1 --- pkgs/applications/science/math/R/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 0c9f700bd42..f016dc460c6 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -13,11 +13,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "R"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "109732arm6dq6d6v3fl1nyx63lcvv9569j8g6r3s2b18sxcqkrp8"; + sha256 = "0r6kpnxjbvb7gdfg4m1z8zc6xd225vw81wrnf05ps9ajawk06pji"; }; dontUseImakeConfigure = true; @@ -30,19 +30,6 @@ stdenv.mkDerivation rec { patches = [ ./no-usr-local-search-paths.patch - ] ++ lib.optionals (!withRecommendedPackages) [ - (fetchpatch { - name = "fix-tests-without-recommended-packages.patch"; - url = "https://github.com/wch/r-source/commit/7715c67cabe13bb15350cba1a78591bbb76c7bac.patch"; - # this part of the patch reverts something that was committed after R 4.1.0, so ignore it. - excludes = [ "tests/Pkgs/xDir/pkg/DESCRIPTION" ]; - sha256 = "sha256-iguLndCIuKuCxVCi/4NSu+9RzBx5JyeHx3K6IhpYshQ="; - }) - (fetchpatch { - name = "use-codetools-conditionally.patch"; - url = "https://github.com/wch/r-source/commit/7543c28b931db386bb254e58995973493f88e30d.patch"; - sha256 = "sha256-+yHXB5AItFyQjSxfogxk72DrSDGiBh7OiLYFxou6Xlk="; - }) ]; prePatch = lib.optionalString stdenv.isDarwin '' From 9ecfbe0c5bfc28a4d411a87093179cd8b97bda60 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 11 Aug 2021 05:07:42 -0400 Subject: [PATCH 027/234] mingw: Disalbe FORTIFY_SOURCE by default. In newer versions of mingw, programs compiled with FORTIFY_SOURCE need to link to libssp or they will have link-time errors. gmp has been broken since @pstn updated mingw-64 in c60a0b044747037b87e7ec24b60d221e261b8a6b --- pkgs/build-support/cc-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 678027f9bf4..804f59286c7 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -472,7 +472,7 @@ stdenv.mkDerivation { + optionalString hostPlatform.isCygwin '' hardening_unsupported_flags+=" pic" '' + optionalString targetPlatform.isMinGW '' - hardening_unsupported_flags+=" stackprotector" + hardening_unsupported_flags+=" stackprotector fortify" '' + optionalString targetPlatform.isAvr '' hardening_unsupported_flags+=" stackprotector pic" '' + optionalString (targetPlatform.libc == "newlib") '' From cd6aea6a92373caadb04952d5f4a8f972ee54868 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 11:38:06 +0200 Subject: [PATCH 028/234] python3Packages.responses: 0.13.3 -> 0.13.4 --- pkgs/development/python-modules/responses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 8b700701d31..2c2814592c1 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.13.3"; + version = "0.13.4"; src = fetchPypi { inherit pname version; - sha256 = "18a5b88eb24143adbf2b4100f328a2f5bfa72fbdacf12d97d41f07c26c45553d"; + sha256 = "sha256-lHZ3XYVtPCSuZgu+vin7bXidStFqzXI++/tu4gmQuJk="; }; propagatedBuildInputs = [ cookies mock requests six ]; From 8141e2f2d50dfc8d12d1b8678ab0eca5c599f89b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 12:16:04 +0200 Subject: [PATCH 029/234] python3Packages.responses: enable tests and add meta --- .../python-modules/responses/default.nix | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 2c2814592c1..ebb4716cd89 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -1,5 +1,15 @@ -{ buildPythonPackage, fetchPypi -, cookies, mock, requests, six }: +{ lib +, buildPythonPackage +, cookies +, fetchPypi +, mock +, pytest-localserver +, pytestCheckHook +, pythonOlder +, requests +, six +, urllib3 +}: buildPythonPackage rec { pname = "responses"; @@ -10,7 +20,27 @@ buildPythonPackage rec { sha256 = "sha256-lHZ3XYVtPCSuZgu+vin7bXidStFqzXI++/tu4gmQuJk="; }; - propagatedBuildInputs = [ cookies mock requests six ]; + propagatedBuildInputs = [ + requests + urllib3 + six + ] ++ lib.optionals (pythonOlder "3.4") [ + cookies + ] ++ lib.optionals (pythonOlder "3.3") [ + mock + ]; - doCheck = false; + checkInputs = [ + pytest-localserver + pytestCheckHook + ]; + + pythonImportsCheck = [ "responses" ]; + + meta = with lib; { + description = "Python module for mocking out the requests Python library"; + homepage = "https://github.com/getsentry/responses"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; } From 610e0ea990c92f705ae0c1a90c872a16e66138b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Jul 2021 22:58:11 +0200 Subject: [PATCH 030/234] python3Packages.smbprotocol: 1.5.1 -> 1.6.1 --- pkgs/development/python-modules/smbprotocol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index 73a43be383b..b182667cfcb 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.5.1"; + version = "1.6.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "1ym0fvljbwgl1h7f63m3psbsvqm64fipsrrmbqb97hrhfdzxqxpa"; + sha256 = "0pyjnmrkiqcd0r1s6zl8w91zy0605k7cyy5n4cvv52079gy0axhd"; }; propagatedBuildInputs = [ From 5f073a669da7f0147373799e1cf43a6943972991 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 11 Aug 2021 08:13:13 -0400 Subject: [PATCH 031/234] libsodium: Don't fortify on mingw --- pkgs/development/libraries/libsodium/default.nix | 7 ++++++- .../libraries/libsodium/mingw-no-fortify.patch | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libsodium/mingw-no-fortify.patch diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index ba8bc3f334e..bc8a2ced7cd 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "libsodium"; @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" ]; + + patches = lib.optional stdenv.targetPlatform.isMinGW ./mingw-no-fortify.patch; + + nativeBuildInputs = lib.optional stdenv.targetPlatform.isMinGW autoreconfHook; + separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libsodium/mingw-no-fortify.patch b/pkgs/development/libraries/libsodium/mingw-no-fortify.patch new file mode 100644 index 00000000000..e13a801f8db --- /dev/null +++ b/pkgs/development/libraries/libsodium/mingw-no-fortify.patch @@ -0,0 +1,15 @@ +diff -Naur libsodium-1.0.18-orig/configure.ac libsodium-1.0.18/configure.ac +--- libsodium-1.0.18-orig/configure.ac 2019-05-30 16:20:24.000000000 -0400 ++++ libsodium-1.0.18/configure.ac 2021-08-11 08:09:54.653907245 -0400 +@@ -217,11 +217,6 @@ + + AC_CHECK_DEFINE([__wasi__], [WASI="yes"], []) + +-AC_CHECK_DEFINE([_FORTIFY_SOURCE], [], [ +- AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2], +- [CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"]) +-]) +- + AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], + [CFLAGS="$CFLAGS -fvisibility=hidden"]) + From 394c34d7bba86338a6b9e958352742561208994d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Aug 2021 14:53:10 +0200 Subject: [PATCH 032/234] tts: 0.1.3 -> 0.2.0 --- pkgs/tools/audio/tts/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index bb5eda93a59..dfc5f664645 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -16,13 +16,13 @@ python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "0akhiaaqz53bf5zyps3vgjifmgh5wvcc9r4lrq9hmj3dds03vkjq"; + sha256 = "sha256-FlxR1bPkUZT3SPuWiK0oAuI9dKfurEZurB0NhyDgOyY="; }; postPatch = '' @@ -40,6 +40,7 @@ python3.pkgs.buildPythonApplication rec { anyascii coqpit flask + fsspec gruut gdown inflect @@ -104,6 +105,7 @@ python3.pkgs.buildPythonApplication rec { "tests/vocoder_tests/test_vocoder_tf_melgan_generator.py" "tests/tts_tests/test_tacotron2_tf_model.py" # RuntimeError: fft: ATen not compiled with MKL support + "tests/tts_tests/test_vits_train.py" "tests/vocoder_tests/test_fullband_melgan_train.py" "tests/vocoder_tests/test_hifigan_train.py" "tests/vocoder_tests/test_melgan_train.py" From 307c0237d7bfce7e4d84c65ec16a7af266809f0e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 11 Aug 2021 15:50:33 +0200 Subject: [PATCH 033/234] lib.generators: Handle no drvPath in toPretty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, if a derivation without a `drvPath` was handled, an error would be thrown: nix-repl> lib.generators.toPretty {} { type = "derivation"; } error: attribute 'drvPath' missing, at /home/infinisil/src/nixpkgs/lib/generators.nix:251:24 With this commit it doesn't anymore: nix-repl> lib.generators.toPretty {} { type = "derivation"; } "" This matches what `nix repl` outputs: nix-repl> { type = "derivation"; } «derivation ???» --- lib/generators.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/generators.nix b/lib/generators.nix index c8144db50ac..bcb0f371a9b 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -248,7 +248,7 @@ rec { then v.__pretty v.val else if v == {} then "{ }" else if v ? type && v.type == "derivation" then - "" + "" else "{" + introSpace + libStr.concatStringsSep introSpace (libAttr.mapAttrsToList (name: value: From 4dfa596f93f76c528e02856216b8f218cac4796c Mon Sep 17 00:00:00 2001 From: Poscat Date: Thu, 12 Aug 2021 00:06:44 +0800 Subject: [PATCH 034/234] kea: 1.9.9 -> 1.9.10 --- pkgs/tools/networking/kea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index e3e4a67c131..8928215dccb 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.9"; + version = "1.9.10"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-iVSWBR1+SkXlkwMii2PXpcxFSXYigz4lfNnMZBvS2kM="; + sha256 = "08pr2qav87jmrf074v8zbqyjkl51wf6r9hhgbkzhdav9d4f9kny3"; }; patches = [ ./dont-create-var.patch ]; From 46b7a5be1ced0280951d1a5736b0316de92a53f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 11 Aug 2021 20:02:34 +0200 Subject: [PATCH 035/234] libspf2: Fix CVE-2021-20314 There is no new release yet (see mailing list post on oss-security), so I'm picking the commit that fixes the CVE. There is another security flaw (without a CVE number) that is also mentioned in the oss-security announcement but it is not explained which commit patches the problem. --- pkgs/development/libraries/libspf2/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index 6a9cb8b647c..dc46e356e2c 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { url = "https://github.com/shevek/libspf2/commit/5852828582f556e73751076ad092f72acf7fc8b6.patch"; sha256 = "1v6ashqzpr0xidxq0vpkjd8wd66cj8df01kyzj678ljzcrax35hk"; }) + (fetchurl { + name = "0002-CVE-2021-20314.patch"; + url = "https://github.com/shevek/libspf2/commit/c37b7c13c30e225183899364b9f2efdfa85552ef.patch"; + sha256 = "190nnh7mlz6328829ba6jajad16s3md8kraspn81qnvhwh0nkiak"; + }) ]; postPatch = '' From c9746ee9e5052ad6a1c969c176e6fb709244d30f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 20:11:33 +0200 Subject: [PATCH 036/234] python3Packages.connexion: 2.7.0 -> 2.9.0 --- .../python-modules/connexion/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 0429ee7a507..ed6f2da5142 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -7,6 +7,7 @@ , clickclick , decorator , fetchFromGitHub +, fetchpatch , flask , inflection , jsonschema @@ -22,14 +23,14 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.7.0"; + version = "2.9.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = version; - sha256 = "15iflq5403diwda6n6qrpq67wkdcvl3vs0gsg0fapxqnq3a2m7jj"; + sha256 = "13smcg2w24zr2sv1968g9p9m6f18nqx688c96qdlmldnszgzf5ik"; }; propagatedBuildInputs = [ @@ -54,6 +55,15 @@ buildPythonPackage rec { testfixtures ]; + patches = [ + # No minor release for later versions, https://github.com/zalando/connexion/pull/1402 + (fetchpatch { + name = "allow-later-flask-and-werkzeug-releases.patch"; + url = "https://github.com/zalando/connexion/commit/4a225d554d915fca17829652b7cb8fe119e14b37.patch"; + sha256 = "0dys6ymvicpqa3p8269m4yv6nfp58prq3fk1gcx1z61h9kv84g1k"; + }) + ]; + pythonImportsCheck = [ "connexion" ]; meta = with lib; { From a4f75a3f79afc9740953d5d8951c10f255a5eac8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 20:28:32 +0200 Subject: [PATCH 037/234] python3Packages.awesomeversion: 21.6.0 -> 21.8.0 --- pkgs/development/python-modules/awesomeversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index eed17286805..7b7d432f0c6 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.6.0"; + version = "21.8.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-TODlLaj3bcNVHrly614oKe2OkhmowsJojpR7apUIojc="; + sha256 = "sha256-j5y3f6F+8PzOPxpBHE3LKF3kdRzP4d21N/1Bd6v+MQg="; }; postPatch = '' From f5152b2122610597bf2e729cb93dde73f5767772 Mon Sep 17 00:00:00 2001 From: sophrosyne97 Date: Wed, 11 Aug 2021 14:31:13 -0400 Subject: [PATCH 038/234] etesync-dav: 0.30.7 -> 0.30.8 --- pkgs/applications/misc/etesync-dav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index ba3568f862c..3acb493c1c0 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.30.7"; + version = "0.30.8"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "16b3105834dd6d9e374e976cad0978e1acfed0f0328c5054bc214550aea3e2c5"; + sha256 = "sha256-HBLQsq3B6TMdcnUt8ukbk3+S0Ed44+gePkpuGZ2AyC4="; }; propagatedBuildInputs = with python3Packages; [ From 34a7dce51a3a0fbf36a966a83409b4ce0f76733a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 20:35:26 +0200 Subject: [PATCH 039/234] terrascan: 1.8.1 -> 1.9.0 --- pkgs/tools/security/terrascan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index d3af5e368f5..106012bd7a3 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eCkinYJtZNf5Fo+LXu01cHRInA9CfDONvt1OIs3XJSk="; + sha256 = "sha256-DTwA8nHWKOXeha0TBoEGJuoUedxJVev0R0GnHuaHEMc="; }; - vendorSha256 = "1fqk9dpbfz97jwx1m54a8q67g95n5w7m1bxb7g9gkzk98f1zzv3r"; + vendorSha256 = "sha256-gDhEaJ444d7fITVaEkH5RXMykmZyXjC+mPfaa2vkpIk="; # Tests want to download a vulnerable Terraform project doCheck = false; From 07deb55d5d18f9212e7109c389fe5d55968b16c8 Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Wed, 11 Aug 2021 12:55:08 -0600 Subject: [PATCH 040/234] plan9port: unmark as broken on darwin Builds and runs just fine with an overlay filtering out the broken attr --- pkgs/tools/system/plan9port/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 78db6e2037e..a735e35624f 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -90,7 +90,6 @@ stdenv.mkDerivation { kovirobi ]; platforms = platforms.unix; - broken = stdenv.isDarwin; }; } # TODO: investigate the mouse chording support patch From d2a64c011299753158726de76588273ea2dec4c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 21:20:26 +0200 Subject: [PATCH 041/234] sqlfluff: 0.6.1 -> 0.6.2 --- pkgs/development/tools/database/sqlfluff/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 975254b83d7..3b221e5ce4e 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.1"; + version = "0.6.2"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0p5vjpfmy52hbq6mz8svvxrg9757cvgj0cbvaa0340309953ilvj"; + sha256 = "sha256-N1ZIm5LsKXXu3CyqFJZd7biaIhVW1EMBLKajgSAwc0g="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -28,10 +28,9 @@ python3.pkgs.buildPythonApplication rec { pytest tblib toml + typing-extensions ] ++ lib.optionals (pythonOlder "3.7") [ dataclasses - ] ++ lib.optionals (pythonOlder "3.9") [ - typing-extensions ]; checkInputs = with python3.pkgs; [ From 4a5b36725919c002751228515d518f23772f988e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 9 Aug 2021 11:57:15 +0200 Subject: [PATCH 042/234] chromium: Restructure the code This should make it a little bit easier to read. The (native) build inputs and options now have a consistent order, defaultDependencies and yasm aren't required anymore, and this adds some brief comments. Note: The third_party/node/linux/node-linux-x64/bin/node change causes rebuilds. --- .../networking/browsers/chromium/common.nix | 94 ++++++++++--------- 1 file changed, 51 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a62999d2843..8884148228b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,40 +1,49 @@ -{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl +{ stdenv, lib, fetchurl, fetchpatch +# Channel data: +, channel, upstream-info -# default dependencies -, gnutar, bzip2, flac, speex, libopus +# Native build inputs: +, ninja, pkg-config +, python2, python3, perl +, gnutar, which +, llvmPackages +# postPatch: +, pkgsBuildHost +# configurePhase: +, gnChromium + +# Build inputs: +, libpng +, bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy -, libpng, libcap -, xdg-utils, yasm, nasm, minizip, libwebp -, libusb1, pciutils, nss, re2 - -, python2, python3, perl, pkg-config -, nspr, systemd, libkrb5 +, libcap +, xdg-utils, minizip, libwebp +, libusb1, re2 +, ffmpeg, libxslt, libxml2 +, nasm +, nspr, nss, systemd , util-linux, alsa-lib -, bison, gperf +, bison, gperf, libkrb5 , glib, gtk3, dbus-glib -, glibc , libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL -, protobuf, speechd, libXdamage, cups -, ffmpeg, libxslt, libxml2, at-spi2-core -, jre8 +, mesa +, pciutils, protobuf, speechd, libXdamage, at-spi2-core , pipewire , libva -, libdrm, wayland, mesa, libxkbcommon # Ozone +, libdrm, wayland, libxkbcommon # Ozone , curl +# postPatch: +, glibc # gconv + locale -# optional dependencies -, libgcrypt ? null # gnomeSupport || cupsSupport - -# package customization +# Package customization: , gnomeSupport ? false, gnome2 ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null +, cupsSupport ? true, cups ? null , proprietaryCodecs ? true -, cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null , ungoogled ? false, ungoogled-chromium - -, channel -, upstream-info +# Optional dependencies: +, libgcrypt ? null # gnomeSupport || cupsSupport }: buildFun: @@ -91,17 +100,6 @@ let withCustomModes = true; }; - defaultDependencies = [ - (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 - bzip2 flac speex opusWithCustomModes - libevent expat libjpeg snappy - libcap - xdg-utils minizip libwebp - libusb1 re2 - ffmpeg libxslt libxml2 - nasm - ]; - # build paths and release info packageName = extraAttrs.packageName or extraAttrs.name; buildType = "Release"; @@ -136,12 +134,20 @@ let nativeBuildInputs = [ ninja pkg-config - python2WithPackages python3WithPackages perl nodejs + python2WithPackages python3WithPackages perl gnutar which llvmPackages.bintools ]; - buildInputs = defaultDependencies ++ [ + buildInputs = [ + (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 + bzip2 flac speex opusWithCustomModes + libevent expat libjpeg snappy + libcap + xdg-utils minizip libwebp + libusb1 re2 + ffmpeg libxslt libxml2 + nasm nspr nss systemd util-linux alsa-lib bison gperf libkrb5 @@ -153,14 +159,16 @@ let libva libdrm wayland mesa.drivers libxkbcommon curl - ] ++ optional gnomeKeyringSupport libgnome-keyring3 - ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] + ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] + ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; patches = [ - ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) - ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags + # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): + ./patches/no-build-timestamps.patch + # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: + ./patches/widevine-79.patch # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): ./patches/fix-missing-atspi2-dependency.patch ] ++ lib.optionals (versionRange "91" "94.0.4583.0") [ @@ -239,8 +247,8 @@ let patchShebangs . # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin - ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node - ln -s "${jre8}/bin/java" third_party/jdk/current/bin/ + ln -s "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node + ln -s "${pkgsBuildHost.jre8}/bin/java" third_party/jdk/current/bin/ # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py @@ -272,9 +280,9 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; # Optional features: - use_cups = cupsSupport; use_gio = gnomeSupport; use_gnome_keyring = gnomeKeyringSupport; + use_cups = cupsSupport; # Feature overrides: # Native Client support was deprecated in 2020 and support will end in June 2021: From 624cb8bc2b4fd38db3eff105be197d5b875bc61d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 11 Aug 2021 22:59:11 +0200 Subject: [PATCH 043/234] chromiumDev: 94.0.4595.0 -> 94.0.4603.0 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 43a79bfa7df..8c6c0ba4afe 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "94.0.4595.0", - "sha256": "0ksd7vqpbiplbg2xpm566z7p7qp57r27a3pk6ss1qz8v18490092", - "sha256bin64": "1kibyhgwcgby3hnhjdg2vrgbj4dvvbicqlcj4id9761zw1jhz8r4", + "version": "94.0.4603.0", + "sha256": "1mhb7y7mhjbi5m79izcqvc6pjmgxvlk9vvr273k29gr2zq2m2fv3", + "sha256bin64": "1rqprc2vkyygwwwjk25xa2av30bqbx5dzs6nwhnzsdqwic5wdbbz", "deps": { "gn": { "version": "2021-07-31", From 71d4f8d7e34002e425a699f0dd5b2bd8ae49165e Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 11 Aug 2021 23:06:39 +0200 Subject: [PATCH 044/234] sndio: 1.8.0 -> 1.8.1 --- pkgs/misc/sndio/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 9e4035801f1..474e59c590a 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sndio"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "027hlqji0h2cm96rb8qvkdmwxl56l59bgn828nvmwak2c2i5k703"; + url = "https://www.sndio.org/sndio-${version}.tar.gz"; + sha256 = "08b33bbrhbva1lyzzsj5k6ggcqzrfjfhb2n99a0b8b07kqc3f7gq"; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.sndio.org"; + homepage = "https://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; license = licenses.isc; maintainers = with maintainers; [ chiiruno ]; From 3e3f3ac824096bf606fd49fd4143901502de957f Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 12 Aug 2021 05:42:51 +0800 Subject: [PATCH 045/234] elfcat: 0.1.4 -> 0.1.6 --- pkgs/tools/misc/elfcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/tools/misc/elfcat/default.nix index 54b9ce0cc49..91e4dfb99b3 100644 --- a/pkgs/tools/misc/elfcat/default.nix +++ b/pkgs/tools/misc/elfcat/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "ruslashev"; repo = pname; rev = version; - sha256 = "sha256-gh5JO3vO2FpHiZfaHOODPhRSB9HqZe1ir4g7UEkSUHY="; + sha256 = "sha256-v8G9XiZS+49HtuLjs4Co9A1J+5STAerphkLaMGvqXT4="; }; cargoSha256 = null; From d08a041b375094124d7fc7c22634cb557eb47331 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Aug 2021 00:01:03 +0200 Subject: [PATCH 046/234] python3Packages.sendgrid: 6.7.1 -> 6.8.0 --- pkgs/development/python-modules/sendgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 34ef2355905..f4c913b1639 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.7.1"; + version = "6.8.0"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "0g9yifv3p3zbcxbcdyg4p9k3vwvaq0vym40j3yrv534m4qbynwhk"; + sha256 = "sha256-PtTsFwE6+6/HzyR721Y9+qaI7gwYtYwuY+wrZpoGY2Q="; }; propagatedBuildInputs = [ From 95e7a0c7525929fc33eb5fb35d36384cec96b384 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Aug 2021 00:04:30 +0200 Subject: [PATCH 047/234] python3Packages.amqtt: 0.10.0-alpha.4 -> 0.10.0 --- pkgs/development/python-modules/amqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index d0cc2bd5da5..1f5fee4d71b 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "amqtt"; - version = "0.10.0-alpha.4"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Yakifo"; repo = pname; rev = "v${version}"; - sha256 = "1v5hlcciyicnhwk1xslh3kxyjqaw526fb05pvhjpp3zqrmbxya4d"; + sha256 = "sha256-27LmNR1KC8w3zRJ7YBlBolQ4Q70ScTPqypMCpU6fO+I="; }; nativeBuildInputs = [ poetry-core ]; From e74cd76f474f57f1da65b632d0f815a62c43e075 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 Aug 2021 19:38:48 -0300 Subject: [PATCH 048/234] pkgs/top-level/python-packages.nix: alphabetical ordering --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee7db9d5d36..09793131051 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5438,8 +5438,6 @@ in { pysyncthru = callPackage ../development/python-modules/pysyncthru { }; - pytest-subprocess = callPackage ../development/python-modules/pytest-subprocess { }; - python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; python-crfsuite = callPackage ../development/python-modules/python-crfsuite { }; @@ -6967,6 +6965,8 @@ in { pytest-socket = callPackage ../development/python-modules/pytest-socket { }; + pytest-subprocess = callPackage ../development/python-modules/pytest-subprocess { }; + pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; pytest-subtests = callPackage ../development/python-modules/pytest-subtests { }; From 587dcb590edb85c0953446151bfcc94f3cd7385d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 Aug 2021 20:44:33 -0300 Subject: [PATCH 049/234] pythonPackages.pytest-dependency: fix commentary --- .../python-modules/pytest-dependency/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index fc6b716397d..c583288b406 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -1,19 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, pytest +}: buildPythonPackage rec { - version = "0.5.1"; pname = "pytest-dependency"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b"; + hash = "sha256-wqiSkGGSZj+FAwpquRME5QjlRs3f5VfWktYexXodlGs="; }; patches = [ - # Fix build with pytest ≥ 6.2.0, https://github.com/RKrahl/pytest-dependency/pull/51 + # Fix build with pytest >= 6.2.0, https://github.com/RKrahl/pytest-dependency/pull/51 (fetchpatch { url = "https://github.com/RKrahl/pytest-dependency/commit/0930889a13e2b9baa7617f05dc9b55abede5209d.patch"; - sha256 = "0ka892j0rrlnfvk900fcph0f6lsnr9dy06q5k2s2byzwijhdw6n5"; + sha256 = "sha256-xRreoIz8+yW0mAUb4FvKVlPjALzMAZDmdpbmDKRISE0="; }) ]; From 15858a251a3a670096bfd206de821f1cb6f8c501 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 Aug 2021 17:19:34 -0300 Subject: [PATCH 050/234] pythonPackages.fsspec: 2021.06.0 -> 2021.07.0 --- pkgs/development/python-modules/fsspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 8fb7771dbbe..7b9315c8f8f 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2021.06.0"; + version = "2021.07.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "sha256-2yTjaAuORlZMACKnXkZ6QLMV2o71sPMM2O/bDPaPHD0="; + hash = "sha256-I0oR7qxMCB2egyOx69hY0++H7fzCdK3ZyyzCvP3yXAs="; }; propagatedBuildInputs = [ @@ -57,8 +57,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "fsspec" ]; meta = with lib; { - description = "A specification that Python filesystems should adhere to"; homepage = "https://github.com/intake/filesystem_spec"; + description = "A specification that Python filesystems should adhere to"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; From 606679b996b68b38372db3fe6fc78403175b1be0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 9 Aug 2021 20:33:27 -0300 Subject: [PATCH 051/234] pythonPackages.s3fs: 2021.6.0-> 2021.7.0 --- pkgs/development/python-modules/s3fs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 467fe26d244..882f9e90e3f 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2021.6.0"; + version = "2021.7.0"; src = fetchPypi { inherit pname version; - sha256 = "53790061e220713918602c1f110e6a84d6e3e22aaba27b8e134cc56a3ab6284c"; + hash = "sha256-KTKU7I7QhgVhfbRA46UCKaQT3Bbc8yyUj66MvZsCrpY="; }; buildInputs = [ @@ -32,8 +32,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "s3fs" ]; meta = with lib; { - description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3"; homepage = "https://github.com/dask/s3fs/"; + description = "A Pythonic file interface for S3"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; From 8ddad244eaa91af08ad041291c598a67acfe806b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 30 Jul 2021 02:25:15 +0200 Subject: [PATCH 052/234] update-luarocks-packages: use pluginupdate.py Cleans up the common interface between the updaters. Restores the ability to regen the lua packages in parallel. --- maintainers/scripts/pluginupdate.py | 111 +++++++------ maintainers/scripts/update-luarocks-packages | 149 ++++++++++-------- .../editors/kakoune/plugins/update.py | 81 +++++----- .../lua-modules/generated-packages.nix | 35 ++-- pkgs/misc/vim-plugins/update.py | 80 +++++----- 5 files changed, 236 insertions(+), 220 deletions(-) diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 0d656556557..79f5b93be8a 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -42,8 +42,6 @@ LOG_LEVELS = { } log = logging.getLogger() -log.addHandler(logging.StreamHandler()) - def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): """Retry calling the decorated function using an exponential backoff. @@ -203,7 +201,6 @@ class Editor: name: str, root: Path, get_plugins: str, - generate_nix: Callable[[List[Tuple[str, str, Plugin]], str], None], default_in: Optional[Path] = None, default_out: Optional[Path] = None, deprecated: Optional[Path] = None, @@ -213,7 +210,6 @@ class Editor: self.name = name self.root = root self.get_plugins = get_plugins - self._generate_nix = generate_nix self.default_in = default_in or root.joinpath(f"{name}-plugin-names") self.default_out = default_out or root.joinpath("generated.nix") self.deprecated = deprecated or root.joinpath("deprecated.json") @@ -226,9 +222,9 @@ class Editor: def load_plugin_spec(self, plugin_file) -> List[PluginDesc]: return load_plugin_spec(plugin_file) - def generate_nix(self, plugins, outfile): + def generate_nix(self, plugins, outfile: str): '''Returns nothing for now, writes directly to outfile''' - self._generate_nix(plugins, outfile) + raise NotImplementedError() def get_update(self, input_file: str, outfile: str, proc: int): return get_update(input_file, outfile, proc, editor=self) @@ -237,9 +233,58 @@ class Editor: def attr_path(self): return self.name + "Plugins" + def get_drv_name(self, name: str): + return self.attr_path + "." + name + def rewrite_input(self, *args, **kwargs): return rewrite_input(*args, **kwargs) + def create_parser(self): + parser = argparse.ArgumentParser( + description=( + f"Updates nix derivations for {self.name} plugins" + f"By default from {self.default_in} to {self.default_out}" + ) + ) + parser.add_argument( + "--add", + dest="add_plugins", + default=[], + action="append", + help=f"Plugin to add to {self.attr_path} from Github in the form owner/repo", + ) + parser.add_argument( + "--input-names", + "-i", + dest="input_file", + default=self.default_in, + help="A list of plugins in the form owner/repo", + ) + parser.add_argument( + "--out", + "-o", + dest="outfile", + default=self.default_out, + help="Filename to save generated nix code", + ) + parser.add_argument( + "--proc", + "-p", + dest="proc", + type=int, + default=30, + help="Number of concurrent processes to spawn.", + ) + parser.add_argument( + "--no-commit", "-n", action="store_true", default=False, + help="Whether to autocommit changes" + ) + parser.add_argument( + "--debug", "-d", choices=LOG_LEVELS.keys(), + default=logging.getLevelName(logging.WARN), + help="Adjust log level" + ) + return parser @@ -466,54 +511,6 @@ def rewrite_input( with open(input_file, "w") as f: f.writelines(lines) -# TODO move to Editor ? -def parse_args(editor: Editor): - parser = argparse.ArgumentParser( - description=( - f"Updates nix derivations for {editor.name} plugins" - f"By default from {editor.default_in} to {editor.default_out}" - ) - ) - parser.add_argument( - "--add", - dest="add_plugins", - default=[], - action="append", - help=f"Plugin to add to {editor.attr_path} from Github in the form owner/repo", - ) - parser.add_argument( - "--input-names", - "-i", - dest="input_file", - default=editor.default_in, - help="A list of plugins in the form owner/repo", - ) - parser.add_argument( - "--out", - "-o", - dest="outfile", - default=editor.default_out, - help="Filename to save generated nix code", - ) - parser.add_argument( - "--proc", - "-p", - dest="proc", - type=int, - default=30, - help="Number of concurrent processes to spawn.", - ) - parser.add_argument( - "--no-commit", "-n", action="store_true", default=False, - help="Whether to autocommit changes" - ) - parser.add_argument( - "--debug", "-d", choices=LOG_LEVELS.keys(), - default=logging.getLevelName(logging.WARN), - help="Adjust log level" - ) - return parser.parse_args() - def commit(repo: git.Repo, message: str, files: List[Path]) -> None: repo.index.add([str(f.resolve()) for f in files]) @@ -547,12 +544,10 @@ def get_update(input_file: str, outfile: str, proc: int, editor: Editor): return update -def update_plugins(editor: Editor): +def update_plugins(editor: Editor, args): """The main entry function of this module. All input arguments are grouped in the `Editor`.""" - args = parse_args(editor) log.setLevel(LOG_LEVELS[args.debug]) - log.info("Start updating plugins") nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) update = editor.get_update(args.input_file, args.outfile, args.proc) @@ -581,7 +576,7 @@ def update_plugins(editor: Editor): if autocommit: commit( nixpkgs_repo, - "{editor.attr_path}.{name}: init at {version}".format( + "{editor.get_drv_name name}: init at {version}".format( editor=editor.name, name=plugin.normalized_name, version=plugin.version ), [args.outfile, args.input_file], diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index 2524b4c9b89..5123f86e93d 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -16,20 +16,17 @@ from dataclasses import dataclass import subprocess import csv import logging +import textwrap +from multiprocessing.dummy import Pool -from typing import List +from typing import List, Tuple from pathlib import Path -LOG_LEVELS = { - logging.getLevelName(level): level for level in [ - logging.DEBUG, logging.INFO, logging.WARN, logging.ERROR ] -} - log = logging.getLogger() log.addHandler(logging.StreamHandler()) ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent -from pluginupdate import Editor, parse_args, update_plugins, PluginDesc, CleanEnvironment +from pluginupdate import Editor, update_plugins, PluginDesc, CleanEnvironment, LOG_LEVELS, Cache PKG_LIST="maintainers/scripts/luarocks-packages.csv" TMP_FILE="$(mktemp)" @@ -67,12 +64,11 @@ class LuaEditor(Editor): def get_current_plugins(self): return [] - def load_plugin_spec(self, input_file) -> List[PluginDesc]: + def load_plugin_spec(self, input_file) -> List[LuaPlugin]: luaPackages = [] csvfilename=input_file log.info("Loading package descriptions from %s", csvfilename) - with open(csvfilename, newline='') as csvfile: reader = csv.DictReader(csvfile,) for row in reader: @@ -81,96 +77,115 @@ class LuaEditor(Editor): luaPackages.append(plugin) return luaPackages + def generate_nix( + self, + results: List[Tuple[LuaPlugin, str]], + outfilename: str + ): + + with tempfile.NamedTemporaryFile("w+") as f: + f.write(HEADER) + header2 = textwrap.dedent( + # header2 = inspect.cleandoc( + """ + { self, stdenv, lib, fetchurl, fetchgit, ... } @ args: + self: super: + with self; + { + """) + f.write(header2) + for (plugin, nix_expr) in results: + f.write(f"{plugin.normalized_name} = {nix_expr}") + f.write(FOOTER) + f.flush() + + # if everything went fine, move the generated file to its destination + # using copy since move doesn't work across disks + shutil.copy(f.name, outfilename) + + print(f"updated {outfilename}") + @property def attr_path(self): return "luaPackages" - def get_update(self, input_file: str, outfile: str, _: int): + def get_update(self, input_file: str, outfile: str, proc: int): + cache: Cache = Cache(self.cache_file) + _prefetch = generate_pkg_nix def update() -> dict: plugin_specs = self.load_plugin_spec(input_file) + sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower()) - self.generate_nix(plugin_specs, outfile) + try: + pool = Pool(processes=proc) + results = pool.map(_prefetch, sorted_plugin_specs) + finally: + pass + + self.generate_nix(results, outfile) redirects = [] return redirects return update - def rewrite_input(self, *args, **kwargs): + def rewrite_input(self, input_file: str, *args, **kwargs): + # vim plugin reads the file before update but that shouldn't be our case # not implemented yet + # fieldnames = ['name', 'server', 'version', 'luaversion', 'maintainers'] + # input_file = "toto.csv" + # with open(input_file, newline='') as csvfile: + # writer = csv.DictWriter(csvfile, fieldnames=fieldnames) + # writer.writeheader() + # for row in reader: + # # name,server,version,luaversion,maintainers + # plugin = LuaPlugin(**row) + # luaPackages.append(plugin) pass -def generate_nix( - plugins: List[LuaPlugin], - outfilename: str - ): - sorted_plugins = sorted(plugins, key=lambda v: v.name.lower()) +def generate_pkg_nix(plug: LuaPlugin): + ''' + Generate nix expression for a luarocks package + Our cache key associates "p.name-p.version" to its rockspec + ''' + log.debug("Generating nix expression for %s", plug.name) + cmd = [ "luarocks", "nix", plug.name] - # plug = {} - # selon le manifest luarocks.org/manifest - def _generate_pkg_nix(plug): - cmd = [ "luarocks", "nix", plug.name] - if plug.server: - cmd.append(f"--only-server={plug.server}") + if plug.server: + cmd.append(f"--only-server={plug.server}") - if plug.maintainers: - cmd.append(f"--maintainers={plug.maintainers}") + if plug.maintainers: + cmd.append(f"--maintainers={plug.maintainers}") - if plug.version: - cmd.append(plug.version) + if plug.version: + cmd.append(plug.version) - if plug.luaversion: - with CleanEnvironment(): - local_pkgs = str(ROOT.resolve()) - cmd2 = ["nix-build", "--no-out-link", local_pkgs, "-A", f"{plug.luaversion}"] + if plug.luaversion: + with CleanEnvironment(): + local_pkgs = str(ROOT.resolve()) + cmd2 = ["nix-build", "--no-out-link", local_pkgs, "-A", f"{plug.luaversion}"] - log.debug("running %s", cmd2) - lua_drv_path=subprocess.check_output(cmd2, text=True).strip() - cmd.append(f"--lua-dir={lua_drv_path}/bin") - - log.debug("running %s", cmd) - output = subprocess.check_output(cmd, text=True) - return output - - with tempfile.NamedTemporaryFile("w+") as f: - f.write(HEADER) - f.write(""" -{ self, stdenv, lib, fetchurl, fetchgit, ... } @ args: -self: super: -with self; -{ -""") - - for plugin in sorted_plugins: - - nix_expr = _generate_pkg_nix(plugin) - f.write(f"{plugin.normalized_name} = {nix_expr}" - ) - f.write(FOOTER) - f.flush() - - # if everything went fine, move the generated file to its destination - # using copy since move doesn't work across disks - shutil.copy(f.name, outfilename) - - print(f"updated {outfilename}") - -def load_plugin_spec(): - pass + log.debug("running %s", ' '.join(cmd2)) + lua_drv_path=subprocess.check_output(cmd2, text=True).strip() + cmd.append(f"--lua-dir={lua_drv_path}/bin") + log.debug("running %s", cmd) + output = subprocess.check_output(cmd, text=True) + return (plug, output) def main(): - editor = LuaEditor("lua", ROOT, '', generate_nix, + editor = LuaEditor("lua", ROOT, '', default_in = ROOT.joinpath(PKG_LIST), default_out = ROOT.joinpath(GENERATED_NIXFILE) ) - args = parse_args(editor) + parser = editor.create_parser() + args = parser.parse_args() log.setLevel(LOG_LEVELS[args.debug]) - update_plugins(editor) + update_plugins(editor, args) if __name__ == "__main__": diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index b6a4bfe4f41..40a28d9afe2 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -39,52 +39,57 @@ in lib.filterAttrs (n: v: v != null) checksums)""" HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!" +class KakouneEditor(pluginupdate.Editor): -def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): - sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) - with open(outfile, "w+") as f: - f.write(HEADER) - f.write( - """ -{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: -let - packages = ( self: -{""" - ) - for owner, repo, plugin in sorted_plugins: - if plugin.has_submodules: - submodule_attr = "\n fetchSubmodules = true;" - else: - submodule_attr = "" + def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): + sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) + with open(outfile, "w+") as f: + f.write(HEADER) f.write( - f""" - {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ - pname = "{plugin.normalized_name}"; - version = "{plugin.version}"; - src = fetchFromGitHub {{ - owner = "{owner}"; - repo = "{repo}"; - rev = "{plugin.commit}"; - sha256 = "{plugin.sha256}";{submodule_attr} - }}; - meta.homepage = "https://github.com/{owner}/{repo}/"; - }}; -""" + """ + { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: + let + packages = ( self: + {""" ) - f.write( - """ -}); -in lib.fix' (lib.extends overrides packages) -""" - ) - print(f"updated {outfile}") + for owner, repo, plugin in sorted_plugins: + if plugin.has_submodules: + submodule_attr = "\n fetchSubmodules = true;" + else: + submodule_attr = "" + + f.write( + f""" + {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ + pname = "{plugin.normalized_name}"; + version = "{plugin.version}"; + src = fetchFromGitHub {{ + owner = "{owner}"; + repo = "{repo}"; + rev = "{plugin.commit}"; + sha256 = "{plugin.sha256}";{submodule_attr} + }}; + meta.homepage = "https://github.com/{owner}/{repo}/"; + }}; + """ + ) + f.write( + """ + }); + in lib.fix' (lib.extends overrides packages) + """ + ) + print(f"updated {outfile}") def main(): - editor = pluginupdate.Editor("kakoune", ROOT, GET_PLUGINS, generate_nix) - pluginupdate.update_plugins(editor) + editor = KakouneEditor("kakoune", ROOT, GET_PLUGINS) + parser = editor.create_parser() + args = parser.parse_args() + + pluginupdate.update_plugins(editor, args) if __name__ == "__main__": diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 782084c1995..6bd6d7891e9 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -110,20 +110,20 @@ binaryheap = buildLuarocksPackage { bit32 = buildLuarocksPackage { pname = "bit32"; - version = "5.3.0-1"; + version = "5.3.5.1-1"; src = fetchurl { url = "https://luarocks.org/bit32-5.3.0-1.src.rock"; sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy"; }; - disabled = (luaOlder "5.1"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = with lib; { homepage = "http://www.lua.org/manual/5.2/manual.html#6.7"; description = "Lua 5.2 bit manipulation library"; maintainers = with maintainers; [ lblasc ]; - license.fullName = "MIT/X11"; + license.fullName = "MIT"; }; }; @@ -169,16 +169,15 @@ cassowary = buildLuarocksPackage { license.fullName = "Apache 2"; }; }; - compat53 = buildLuarocksPackage { pname = "compat53"; - version = "0.7-1"; + version = "0.8-1"; src = fetchurl { url = "https://luarocks.org/compat53-0.7-1.src.rock"; sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = with lib; { @@ -275,7 +274,7 @@ cyrussasl = buildLuarocksPackage { digestif = buildLuarocksPackage { pname = "digestif"; - version = "0.2-1"; + version = "0.4-1"; src = fetchurl { url = "mirror://luarocks/digestif-0.2-1.src.rock"; @@ -328,7 +327,7 @@ fifo = buildLuarocksPackage { http = buildLuarocksPackage { pname = "http"; - version = "0.3-0"; + version = "0.4-0"; src = fetchurl { url = "https://luarocks.org/http-0.3-0.src.rock"; @@ -1130,13 +1129,13 @@ luaevent = buildLuarocksPackage { luaexpat = buildLuarocksPackage { pname = "luaexpat"; - version = "1.3.0-1"; + version = "1.3.3-1"; src = fetchurl { url = "https://luarocks.org/luaexpat-1.3.0-1.src.rock"; sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a"; }; - disabled = (luaOlder "5.1"); + disabled = (luaOlder "5.0"); propagatedBuildInputs = [ lua ]; meta = with lib; { @@ -1167,7 +1166,7 @@ luaffi = buildLuarocksPackage { luafilesystem = buildLuarocksPackage { pname = "luafilesystem"; - version = "1.7.0-2"; + version = "1.8.0-1"; src = fetchurl { url = "https://luarocks.org/luafilesystem-1.7.0-2.src.rock"; @@ -1220,14 +1219,14 @@ luaossl = buildLuarocksPackage { luaposix = buildLuarocksPackage { pname = "luaposix"; - version = "34.1.1-1"; + version = "35.0-1"; src = fetchurl { url = "https://luarocks.org/luaposix-34.1.1-1.src.rock"; sha256 = "1l9pkn3g0nzlbmmfj12rhfwvkqb06c21ydqxqgmnmd3w9z4ck53w"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ bit32 lua ]; + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua ]; meta = with lib; { homepage = "http://github.com/luaposix/luaposix/"; @@ -1408,7 +1407,6 @@ luazip = buildLuarocksPackage { license.fullName = "MIT"; }; }; - luuid = buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; @@ -1429,11 +1427,11 @@ luuid = buildLuarocksPackage { luv = buildLuarocksPackage { pname = "luv"; - version = "1.30.0-0"; + version = "1.41.1-0"; src = fetchurl { - url = "https://luarocks.org/luv-1.30.0-0.src.rock"; - sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; + url = "https://luarocks.org/luv-1.41.1-0.src.rock"; + sha256 = "0l1v07nhrkzsddbcc4bak382b5flyw6x8g4i394ylbfl25zwcmai"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1546,7 +1544,6 @@ mpack = buildLuarocksPackage { license.fullName = "MIT"; }; }; - nvim-client = buildLuarocksPackage { pname = "nvim-client"; version = "0.2.2-1"; diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index df948cc0e55..fdb33df9729 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -11,9 +11,14 @@ import inspect import os import sys +import logging +import textwrap from typing import List, Tuple from pathlib import Path +log = logging.getLogger() +log.addHandler(logging.StreamHandler()) + # Import plugin update library from maintainers/scripts/pluginupdate.py ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) sys.path.insert(0, os.path.join(ROOT.parent.parent.parent, "maintainers", "scripts")) @@ -40,50 +45,49 @@ HEADER = ( ) -def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): - sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) +class VimEditor(pluginupdate.Editor): + def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): + sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) - with open(outfile, "w+") as f: - f.write(HEADER) - f.write( - """ -{ lib, buildVimPluginFrom2Nix, fetchFromGitHub }: + with open(outfile, "w+") as f: + f.write(HEADER) + f.write(textwrap.dedent(""" + { lib, buildVimPluginFrom2Nix, fetchFromGitHub }: -final: prev: -{""" - ) - for owner, repo, plugin in sorted_plugins: - if plugin.has_submodules: - submodule_attr = "\n fetchSubmodules = true;" - else: - submodule_attr = "" + final: prev: + {""" + )) + for owner, repo, plugin in sorted_plugins: + if plugin.has_submodules: + submodule_attr = "\n fetchSubmodules = true;" + else: + submodule_attr = "" + + f.write(textwrap.indent(textwrap.dedent( + f""" + {plugin.normalized_name} = buildVimPluginFrom2Nix {{ + pname = "{plugin.normalized_name}"; + version = "{plugin.version}"; + src = fetchFromGitHub {{ + owner = "{owner}"; + repo = "{repo}"; + rev = "{plugin.commit}"; + sha256 = "{plugin.sha256}";{submodule_attr} + }}; + meta.homepage = "https://github.com/{owner}/{repo}/"; + }}; + """ + ), ' ')) + f.write("\n}") + print(f"updated {outfile}") - f.write( - f""" - {plugin.normalized_name} = buildVimPluginFrom2Nix {{ - pname = "{plugin.normalized_name}"; - version = "{plugin.version}"; - src = fetchFromGitHub {{ - owner = "{owner}"; - repo = "{repo}"; - rev = "{plugin.commit}"; - sha256 = "{plugin.sha256}";{submodule_attr} - }}; - meta.homepage = "https://github.com/{owner}/{repo}/"; - }}; -""" - ) - f.write( - """ -} -""" - ) - print(f"updated {outfile}") def main(): - editor = pluginupdate.Editor("vim", ROOT, GET_PLUGINS, generate_nix) - pluginupdate.update_plugins(editor) + editor = VimEditor("vim", ROOT, GET_PLUGINS) + parser = editor.create_parser() + args = parser.parse_args() + pluginupdate.update_plugins(editor, args) if __name__ == "__main__": From 5e4ece6c6ae6dc0ccf59fe2273dee53f65c0f82b Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com"> Date: Thu, 12 Aug 2021 00:37:58 +0200 Subject: [PATCH 053/234] luaPackages: update --- .../lua-modules/generated-packages.nix | 102 ++++++++++++------ 1 file changed, 68 insertions(+), 34 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 6bd6d7891e9..d7a146ad424 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -34,7 +34,7 @@ ansicolors = buildLuarocksPackage { version = "1.0.2-3"; src = fetchurl { - url = "https://luarocks.org/ansicolors-1.0.2-3.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ansicolors-1.0.2-3.src.rock"; sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; }; disabled = (luaOlder "5.1"); @@ -94,7 +94,7 @@ binaryheap = buildLuarocksPackage { version = "0.4-1"; src = fetchurl { - url = "https://luarocks.org/binaryheap-0.4-1.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/binaryheap-0.4-1.src.rock"; sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; }; disabled = (luaOlder "5.1"); @@ -110,20 +110,20 @@ binaryheap = buildLuarocksPackage { bit32 = buildLuarocksPackage { pname = "bit32"; - version = "5.3.5.1-1"; + version = "5.3.0-1"; src = fetchurl { url = "https://luarocks.org/bit32-5.3.0-1.src.rock"; sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { homepage = "http://www.lua.org/manual/5.2/manual.html#6.7"; description = "Lua 5.2 bit manipulation library"; maintainers = with maintainers; [ lblasc ]; - license.fullName = "MIT"; + license.fullName = "MIT/X11"; }; }; @@ -169,15 +169,16 @@ cassowary = buildLuarocksPackage { license.fullName = "Apache 2"; }; }; + compat53 = buildLuarocksPackage { pname = "compat53"; - version = "0.8-1"; + version = "0.7-1"; src = fetchurl { - url = "https://luarocks.org/compat53-0.7-1.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/compat53-0.7-1.src.rock"; sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = with lib; { @@ -193,7 +194,7 @@ cosmo = buildLuarocksPackage { version = "16.06.04-1"; src = fetchurl { - url = "https://luarocks.org/cosmo-16.06.04-1.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cosmo-16.06.04-1.src.rock"; sha256 = "1adrk74j0x1yzhy0xz9k80hphxdjvm09kpwpbx00sk3kic6db0ww"; }; propagatedBuildInputs = [ lpeg ]; @@ -274,10 +275,10 @@ cyrussasl = buildLuarocksPackage { digestif = buildLuarocksPackage { pname = "digestif"; - version = "0.4-1"; + version = "0.2-1"; src = fetchurl { - url = "mirror://luarocks/digestif-0.2-1.src.rock"; + url = "https://luarocks.org/digestif-0.2-1.src.rock"; sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd"; }; disabled = (luaOlder "5.3"); @@ -325,9 +326,40 @@ fifo = buildLuarocksPackage { }; }; +gitsigns-nvim = buildLuarocksPackage { + pname = "gitsigns.nvim"; + version = "scm-1"; + + knownRockspec = (fetchurl { + url = "https://luarocks.org/gitsigns.nvim-scm-1.rockspec"; + sha256 = "12cl4dpx18jrdjfzfk8mckqgb52fh9ayikqny5rfn2s4mbn9i5lj"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/lewis6991/gitsigns.nvim", + "rev": "083dc2f485571546144e287c38a96368ea2e79a1", + "date": "2021-08-09T21:58:59+01:00", + "path": "/nix/store/1kwvlcshbbk31i4pa3s9gx8znsh9nwk2-gitsigns.nvim", + "sha256": "0vrb900p2rc323axb93hc7jwcxg8455zwqsvxm9vkd2mcsdpn33w", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = (lua.luaversion != "5.1"); + propagatedBuildInputs = [ lua plenary-nvim ]; + + meta = with lib; { + homepage = "http://github.com/lewis6991/gitsigns.nvim"; + description = "Git signs written in pure lua"; + license.fullName = "MIT/X11"; + }; +}; + http = buildLuarocksPackage { pname = "http"; - version = "0.4-0"; + version = "0.3-0"; src = fetchurl { url = "https://luarocks.org/http-0.3-0.src.rock"; @@ -349,7 +381,7 @@ inspect = buildLuarocksPackage { version = "3.1.1-0"; src = fetchurl { - url = "https://luarocks.org/inspect-3.1.1-0.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/inspect-3.1.1-0.src.rock"; sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; }; disabled = (luaOlder "5.1"); @@ -421,7 +453,7 @@ lgi = buildLuarocksPackage { version = "0.9.2-1"; src = fetchurl { - url = "https://luarocks.org/lgi-0.9.2-1.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lgi-0.9.2-1.src.rock"; sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; }; disabled = (luaOlder "5.1"); @@ -439,7 +471,7 @@ linenoise = buildLuarocksPackage { version = "0.9-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/linenoise-0.9-1.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/linenoise-0.9-1.rockspec"; sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4"; }).outPath; @@ -482,7 +514,7 @@ lpeg = buildLuarocksPackage { version = "1.0.2-1"; src = fetchurl { - url = "https://luarocks.org/lpeg-1.0.2-1.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeg-1.0.2-1.src.rock"; sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; }; disabled = (luaOlder "5.1"); @@ -536,7 +568,7 @@ lpty = buildLuarocksPackage { version = "1.2.2-1"; src = fetchurl { - url = "https://luarocks.org/lpty-1.2.2-1.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.src.rock"; sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; }; disabled = (luaOlder "5.1"); @@ -743,7 +775,7 @@ lua-resty-http = buildLuarocksPackage { version = "0.16.1-0"; src = fetchurl { - url = "https://luarocks.org/lua-resty-http-0.16.1-0.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-resty-http-0.16.1-0.src.rock"; sha256 = "0n5hiablpc0dsccs6h76zg81wc3jb4mdvyfn9lfxnhls3yqwrgkj"; }; disabled = (luaOlder "5.1"); @@ -922,7 +954,7 @@ lua_cliargs = buildLuarocksPackage { version = "3.0-2"; src = fetchurl { - url = "https://luarocks.org/lua_cliargs-3.0-2.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua_cliargs-3.0-2.src.rock"; sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; }; disabled = (luaOlder "5.1"); @@ -1129,13 +1161,13 @@ luaevent = buildLuarocksPackage { luaexpat = buildLuarocksPackage { pname = "luaexpat"; - version = "1.3.3-1"; + version = "1.3.0-1"; src = fetchurl { url = "https://luarocks.org/luaexpat-1.3.0-1.src.rock"; sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a"; }; - disabled = (luaOlder "5.0"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { @@ -1166,7 +1198,7 @@ luaffi = buildLuarocksPackage { luafilesystem = buildLuarocksPackage { pname = "luafilesystem"; - version = "1.8.0-1"; + version = "1.7.0-2"; src = fetchurl { url = "https://luarocks.org/luafilesystem-1.7.0-2.src.rock"; @@ -1219,14 +1251,14 @@ luaossl = buildLuarocksPackage { luaposix = buildLuarocksPackage { pname = "luaposix"; - version = "35.0-1"; + version = "34.1.1-1"; src = fetchurl { url = "https://luarocks.org/luaposix-34.1.1-1.src.rock"; sha256 = "1l9pkn3g0nzlbmmfj12rhfwvkqb06c21ydqxqgmnmd3w9z4ck53w"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ bit32 lua ]; meta = with lib; { homepage = "http://github.com/luaposix/luaposix/"; @@ -1376,7 +1408,7 @@ luautf8 = buildLuarocksPackage { version = "0.1.3-1"; src = fetchurl { - url = "https://luarocks.org/luautf8-0.1.3-1.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luautf8-0.1.3-1.src.rock"; sha256 = "1yp4j1r33yvsqf8cggmf4mhaxhz5lqzxhl9mnc0q5lh01yy5di48"; }; disabled = (luaOlder "5.1"); @@ -1407,6 +1439,7 @@ luazip = buildLuarocksPackage { license.fullName = "MIT"; }; }; + luuid = buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; @@ -1427,11 +1460,11 @@ luuid = buildLuarocksPackage { luv = buildLuarocksPackage { pname = "luv"; - version = "1.41.1-0"; + version = "1.30.0-0"; src = fetchurl { - url = "https://luarocks.org/luv-1.41.1-0.src.rock"; - sha256 = "0l1v07nhrkzsddbcc4bak382b5flyw6x8g4i394ylbfl25zwcmai"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luv-1.30.0-0.src.rock"; + sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1544,6 +1577,7 @@ mpack = buildLuarocksPackage { license.fullName = "MIT"; }; }; + nvim-client = buildLuarocksPackage { pname = "nvim-client"; version = "0.2.2-1"; @@ -1585,15 +1619,15 @@ plenary-nvim = buildLuarocksPackage { knownRockspec = (fetchurl { url = "https://luarocks.org/plenary.nvim-scm-1.rockspec"; - sha256 = "1cp2dzf3010q85h300aa7zphyz75qn67lrwf9v6b0p534nzvmash"; + sha256 = "1xgqq0skg3vxahlnh1libc5dvhafp11k6k8cs65jcr9sw6xjycwh"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "git://github.com/nvim-lua/plenary.nvim", - "rev": "d897b4d9fdbc51febd71a1f96c96001ae4fa6121", - "date": "2021-08-03T08:49:43-04:00", - "path": "/nix/store/nwarm7lh0r1rzmx92srq73x3r40whyw1-plenary.nvim", - "sha256": "0rgqby4aakqamiw3ykvzhn3vd2grjkzgfxrpzjjp1ipkd2qak8mb", + "rev": "adf9d62023e2d39d9d9a2bc550feb3ed7b545d0f", + "date": "2021-08-11T11:38:20-04:00", + "path": "/nix/store/fjmpxdswkx54a1n8vwmh3xfrzjq3j5wg-plenary.nvim", + "sha256": "1h11a0lil14c13v5mdzdmxxqjpqip5fhvjbm34827czb5pz1hvcz", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false From fa46b31168a4e050e24fe70631cc7e010bb7e1b5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 11 Aug 2021 19:00:00 -0500 Subject: [PATCH 054/234] caf: 0.18.3 -> 0.18.5 https://github.com/actor-framework/actor-framework/releases/tag/0.18.4 https://github.com/actor-framework/actor-framework/releases/tag/0.18.5 --- pkgs/development/libraries/caf/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 60281e7e0c9..045595a84fd 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.18.3"; + version = "0.18.5"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "sha256-9oQVsfh2mUVr64PjNXYD1wRBNJ8dCLO9eI5WnZ1SSww="; + sha256 = "04b4kjisb5wzq6pilh8xzbxn7qcjgppl8k65hfv0zi0ja8fyp1xk"; }; nativeBuildInputs = [ cmake ]; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = "http://actor-framework.org/"; license = licenses.bsd3; platforms = platforms.unix; + changelog = "https://github.com/actor-framework/actor-framework/raw/${version}/CHANGELOG.md"; maintainers = with maintainers; [ bobakker tobim ]; }; } From 2f33e927564c5a83a9b98f24120717f2c1055d84 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 11 Aug 2021 19:00:00 -0500 Subject: [PATCH 055/234] zeek: 4.0.3 -> 4.1.0 https://github.com/zeek/zeek/releases/tag/v4.1.0 --- pkgs/applications/networking/ids/zeek/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 979d765e9e6..e70d6c187c2 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "zeek"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "1nrkwaj0dilyzhfl6yma214vyakvpi97acyffdr7n4kdm4m6pvik"; + sha256 = "165kva8dgf152ahizqdk0g2y466ij2gyxja5fjxlkxcxr5p357pj"; }; nativeBuildInputs = [ cmake flex bison file ]; From 92908738385789d50b9a1f863f977631de41e92b Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 11 Aug 2021 20:14:23 -0400 Subject: [PATCH 056/234] firefox: fix enableOfficialBranding --- .../networking/browsers/firefox/common.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 514447931f3..52d89d20ffb 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -273,7 +273,10 @@ buildStdenv.mkDerivation ({ '') + '' # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 unset AS - ''; + '' + (lib.optionalString enableOfficialBranding '' + export MOZILLA_OFFICIAL=1 + export BUILD_OFFICIAL=1 + ''); configureFlags = [ "--enable-application=browser" @@ -325,11 +328,7 @@ buildStdenv.mkDerivation ({ cd obj-* ''; - makeFlags = lib.optionals enableOfficialBranding [ - "MOZILLA_OFFICIAL=1" - "BUILD_OFFICIAL=1" - ] - ++ lib.optionals ltoSupport [ + makeFlags = lib.optionals ltoSupport [ "AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar" "LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump" "NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm" From 358ab44a457aba9b227764742badbf1882028676 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Mon, 9 Aug 2021 23:10:15 +0200 Subject: [PATCH 057/234] nixos/xserver: fix a display-manager race condition --- nixos/modules/services/x11/xserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index bb50aa1d35c..7316f6fcfe5 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -681,7 +681,7 @@ in systemd.services.display-manager = { description = "X11 Server"; - after = [ "acpid.service" "systemd-logind.service" ]; + after = [ "acpid.service" "systemd-logind.service" "systemd-user-sessions.service" ]; restartIfChanged = false; From d212d19581918fd73cff2fce12b8afba39d6c370 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 19 Oct 2020 13:14:18 -0700 Subject: [PATCH 058/234] plata-theme: 0.9.8 -> 0.9.9 --- pkgs/data/themes/plata/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index d3a01d45c0a..0e7d88a7883 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, parallel -, sassc, inkscape, libxml2, glib, gtk2, gtk-engine-murrine +, sassc, inkscape, libxml2, glib, gtk_engines, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true , gnomeShellSupport ? true @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "1sqmydvx36f6r4snw22s2q4dvcyg30jd7kg7dibpzqn3njfkkfag"; + sha256 = "1iwvlv9qcrjyfbzab00vjqafmp3vdybz1hi02r6lwbgvwyfyrifk"; }; nativeBuildInputs = [ @@ -35,14 +35,14 @@ stdenv.mkDerivation rec { sassc inkscape libxml2 - glib.dev + glib ] ++ lib.optionals mateSupport [ gtk3 marco ] ++ lib.optional telegramSupport zip; - # GTK2 engines must be on the system path at runtime to be loaded. + buildInputs = [ gtk_engines ]; + propagatedUserEnvPkgs = [ - gtk2 gtk-engine-murrine ]; From 7fe7746b3630b272791fc3ace6d72dfd07eaa419 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 12 Aug 2021 04:34:09 +0300 Subject: [PATCH 059/234] fdk_aac: 2.0.1 -> 2.0.2 --- pkgs/development/libraries/fdk-aac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index dc64a6edce0..725593ead14 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -5,11 +5,11 @@ with lib; stdenv.mkDerivation rec { pname = "fdk-aac"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; - sha256 = "0wgjjc0dfkm2w966lc9c8ir8f671vl1ppch3mya3h58jjjm360c4"; + sha256 = "sha256-yehjDPnUM/POrXSQahUg0iI/ibzT+pJUhhAXRAuOsi8="; }; configureFlags = [ ] From b806d35c3f7565b5150ced7dc26145dd7b2377ff Mon Sep 17 00:00:00 2001 From: Nathan Ringo Date: Wed, 11 Aug 2021 18:11:30 -0500 Subject: [PATCH 060/234] python3Packages.multimethod: typo fix --- pkgs/development/python-modules/multimethod/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix index ded279cd860..af2e5950dc2 100644 --- a/pkgs/development/python-modules/multimethod/default.nix +++ b/pkgs/development/python-modules/multimethod/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pytest-cov ]; - pythomImportsCheck = [ + pythonImportsCheck = [ "multimethod" ]; From 531fe0776bfc41b3c6178ad68501331f5a42d41e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Aug 2021 01:50:37 +0000 Subject: [PATCH 061/234] chezmoi: 2.1.4 -> 2.1.5 --- pkgs/tools/misc/chezmoi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 6d03e49ab87..a308977db4d 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-+KSLmr6tia22XFHYFmn3leRdT6TTKdrQa9PrGGJNPaw="; + sha256 = "sha256-zMmQxg+Qdb4pu+gzouz/lpIu6/u+GaYPhIet7xAgTIk="; }; vendorSha256 = "sha256-9vLOJOWsa6XADvWBLZKlyenqfDSvHuh5Ron4FE2tY7Y="; From 0b420d2afbf0daa34041ba25069e4e67a3422228 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Aug 2021 01:55:34 +0000 Subject: [PATCH 062/234] circleci-cli: 0.1.15663 -> 0.1.15801 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 13badd48e1c..03c51f8a27c 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.15663"; + version = "0.1.15801"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r5528iMy3RRSSRbTOTilnF1FkWBr5VOUWvAZQU/OBjc="; + sha256 = "sha256-nKmBTXeSA7fOIUeCH4uR+x6ldfqBG9OhFbU+XSuBaKE="; }; vendorSha256 = "sha256-VOPXM062CZ6a6CJGzYTHav1OkyiH7XUHXWrRdGekaGQ="; From b90570e6d68f574b6fe3f75a60203559b9a0a10a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 11 Aug 2021 21:00:00 -0500 Subject: [PATCH 063/234] python39Packages.scikit-survival: use scikit-learn to fix evaluation --- pkgs/development/python-modules/scikit-survival/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index 9e9d074e30d..5be6457aa6d 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -8,7 +8,7 @@ , numpy , osqp , pandas -, scikitlearn +, scikit-learn , scipy , pytestCheckHook }: @@ -33,7 +33,7 @@ buildPythonPackage rec { numpy osqp pandas - scikitlearn + scikit-learn scipy ]; From 0314b424346bf5492ce2dca5ea5658185ec85a65 Mon Sep 17 00:00:00 2001 From: "\"Bernardo Meurer\"" <"bernardo@meurer.org"> Date: Wed, 11 Aug 2021 19:03:10 -0700 Subject: [PATCH 064/234] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 260 ++++++++++++++-------------- 1 file changed, 130 insertions(+), 130 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9713d1e9cc3..3dc5ef14b09 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -281,12 +281,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-08-09"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "e5a10501b34a1a6a6d9499a7caccc788e41093ec"; - sha256 = "0l492f2kjzp521xwzihdiv8rhbmq2iql0qxhczk68nqy5lj2x7q0"; + rev = "f4163e2ca987f25c3d1fb5cf3d9329d8ab343f35"; + sha256 = "1wlxfkpa42rvw853x8nalxy3zxaaji0d365jbp3pcvhsy0li33dc"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -437,12 +437,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-09"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "0ec533cd84ee16a420ea50941f5c06faa433ec0a"; - sha256 = "1qxzg5yyz07d76msbbxyk1z1nn4p4si6p8cd00knla8mdyfg779p"; + rev = "5647222ddcf1bb484103da1267028b4074f55a32"; + sha256 = "02dyhgfp76bxggjlyc0kq9wfcz96319x4y49fqmanqdhgmqbzzxb"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -581,12 +581,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-07-26"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "bdd11f8bfbe38522e20e49c97739d747c9db5bcf"; - sha256 = "0a3y0ldj6y7xc3nbkzj2af1zs430z69wkzf5y8mcgxcavfg3krz4"; + rev = "6a9a0ee38d2d28fc978db89237cdceb40aea6de3"; + sha256 = "04ywmwbr8y86z6fgcx4w8w779rl0c9c3q8fazncmx24wmcmilhb5"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -690,24 +690,24 @@ final: prev: compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-07-07"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "a4d7b60dc538b724c4bc7df50687a879bcf764c7"; - sha256 = "1lhy2m4awni2pmz9b7b1hkjmaaf4napgihykqwhm9rshsb0xzgvx"; + rev = "4e3dc7b9950e0e5dbfb9451622de670cf62875ac"; + sha256 = "0nb0jsr65q4497mbikc9fm2vkf2dq64ahxf60lv4rzm2irr3azdj"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-07-25"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "d0256c802411e0e76c979e2b7e150f4f8a71a6b0"; - sha256 = "1crryfvkr9f2dnva565m23cy0v0hz7jkc0ck110ya3ib2r929pmx"; + rev = "e9b92b703389732a4b6100b890daacc5f2115636"; + sha256 = "0czf30dwnksp72ppsydkw2z93s39m5jcmzdrpvlg39zmalxcgbll"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -834,12 +834,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-07-30"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "570c13efcab0191e1ab3837c712c711944cbb21d"; - sha256 = "09iwiicasv9qj8lbs3gljgha91s35xd8cbchmjn6k0ldc8nc19n7"; + rev = "0ca6714f45124afadce133f21bfe00aaa3edc2ad"; + sha256 = "1hy9y34amrcbr64mzllj7xrldkxw0a0qp48mkc17csgxchqc5wxx"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1280,12 +1280,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-07-14"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "49151bc9f7a52b02e5aac5eb76bbb80ba81e3726"; - sha256 = "02csaq7x99l5h175kyy0bwdb8kdq3caldj6gkpc7lx7zdc987pwn"; + rev = "4caf12730256579921d77e80423b339b8128c5b6"; + sha256 = "0zcaxqgmjkps4vlrgd8vdq2b6ys9raj2fhg9xkvlkn5q1pz764f2"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1400,12 +1400,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-08-06"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "14a4681737cf2ac33ff479cebd42398bbe2a68f0"; - sha256 = "0d8cps2sb3p40kwx534430r1yy2mdgvl5vls4wbzw9i71miqnvxk"; + rev = "c13057303e04f32c2f6c5682f553e2f3e744e262"; + sha256 = "1mqsi5i6zxylgpcn40qmgf6r9f3z2v8w0f8ngyb41v4z05zychxg"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1895,12 +1895,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-08-07"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "dd58b795a4863871fe2378dc17c6821e15b0eb59"; - sha256 = "1s33j8xbh4y8hiw7d0msr77h79zqrdcxfnmnf2lkqbh6jzqfyyqf"; + rev = "083dc2f485571546144e287c38a96368ea2e79a1"; + sha256 = "0vrb900p2rc323axb93hc7jwcxg8455zwqsvxm9vkd2mcsdpn33w"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2027,12 +2027,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-08-06"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "d66186aacb6b8fef03832fd149a941a21111049a"; - sha256 = "0dsdbrgqyh0h3kfxkrwh4hqa883r08wkijpdy1dk5wl76b4if2cp"; + rev = "04fc67660a87adc2edbbc0b4b39d379e45c3baf8"; + sha256 = "03yi4n4xx3a2sbnl2s61wk8w1ncrjm4f9hpi2i4566a4fmh6mm1p"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2592,12 +2592,12 @@ final: prev: lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2021-04-06"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "6cb8f4cbe54b735dfa6dbb708cc9eaddead251d2"; - sha256 = "0qggqhj2ikq2ki9g93qgwpl2w5nhssafmwc8a2xkwi4qm4k2shqh"; + rev = "d13642f7a2a4f82da9cb00949ad0163bf5d61e04"; + sha256 = "086f66wkyngcy5x0wmhdi9abna9pq5m6cl0ic2kvdxpbgdl7qc2q"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2652,12 +2652,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-08-08"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "ec36e68de3b73fd20a02d0cebbb9fd370c2ad532"; - sha256 = "078b5ri8hg1vd15n7n8v90rpp4abp93sh2zvzn9ybdlk5wl5kn9g"; + rev = "889e6360c3026fb35101f5d81db630721c526a18"; + sha256 = "03klvjqk7n2ssji1di2w204py32h13lb0jv4d7h6c52y442k0q37"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2736,12 +2736,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-08-09"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "0381f3cb17f46c5e7a7277bb267d8f594da17430"; - sha256 = "1px2m3v9z2gw60i0vjd984b2v434bdkndihsw51nmvxl3w2mbgii"; + rev = "6f0d7b847334ca460b0484cb527afdf13a9febaa"; + sha256 = "1iy6pfz2y4908b22l5zdgj9bynciy6yb4g5x8irgp824m8s3s6ps"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2800,8 +2800,8 @@ final: prev: src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "86bee9cd7b66237730789e872b952759d2f5b3ac"; - sha256 = "0ja7jlwlyjiw8imfqmd4m3i5xx6pkfh7sjm108g3k4fpp8xmpbl7"; + rev = "453b23f1a170f92f378d974d1c72a2739850a018"; + sha256 = "1m1j4g55wzlcflvxf1fci1554ws8g1liihm1qrapccmknpsxcnq6"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3168,12 +3168,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-08-06"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "ba9b6535381690fc6773d682fc046d8ddd2a863a"; - sha256 = "0n2pbl9fcvqp0ikhmlg1rfaig24awkhg8lv79zn6k37yx29kissi"; + rev = "6cbf6f0610e3c194366fc938b4a0ad572ad476e9"; + sha256 = "03afyhpfbwisf4l025bj41qmfaa0awancrd4q8ikq8b07n61mzmv"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3204,12 +3204,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-08-05"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "1ff0099c62dad62f1126dba15b61b35d54aa607f"; - sha256 = "18xczksv70v18xh6f40d5bad2f890vm8gyg5xqh7sh2vh9jdg0jz"; + rev = "10794f73493192f082078ba8fe88e27db1ee4859"; + sha256 = "1myi8b2dzrdycyw94dq0a2mcmyjhlv2711scvqj879kcfkv3i43a"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -3468,12 +3468,12 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-07-30"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "ed06cc9f0e40e96bb7e3900bf6a56858db21e3f7"; - sha256 = "0qr7j9wf7kdkcv9a151nz0sjzvcx926dxss17b7mwrq3bpwhckvh"; + rev = "40ea24ad904f082d593f6f2250521cd8a51a21a1"; + sha256 = "0msn55xd1bk1f2rm7vjz6fsp5pg02pr59ph1ynmg13dnah0h8x85"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3516,24 +3516,24 @@ final: prev: nterm-nvim = buildVimPluginFrom2Nix { pname = "nterm-nvim"; - version = "2021-07-15"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "jlesquembre"; repo = "nterm.nvim"; - rev = "8076f2960512d50a93ffd3d9b04499f9d4fbe793"; - sha256 = "0z2d9jvw7yf415mpvqlx5vc8k9n02vc28v4p1fimvz7axcv67361"; + rev = "9f37152269ae0fe520899f454355ad2158eee1b3"; + sha256 = "1d15l57krygxcg686naqk47g9bl802dbz3mghcihybqhw5sxdn56"; }; meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-08-09"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "07fd5abcab09a370f8d15fc437f79becb121e025"; - sha256 = "0p45wg4g28w6zlfz8cq9a5ypcsf0l6br98khf5gv81zfr4r7n68h"; + rev = "1724d220448a327de92be556e2edb2b3cf2117c1"; + sha256 = "0p53pphn03wh1vlscjk4i8bvn36l2xkxm7f83lvy9yb16a8yky29"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3576,12 +3576,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-08-09"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "13820ff0af7dec102b15c68f7c8fcd94302099f7"; - sha256 = "0b59ikp6z63mls64szk3bc7hzvmwrsb97k6b56vaylbx9g1wvlk6"; + rev = "d71b3f6060a056dd4d3830b6406fe7143691d631"; + sha256 = "0f4w32gpb3n415x4h6fbfi8cvcmxb0mp3vspnga6n2zynvwv9rfq"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3624,12 +3624,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-08-09"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "5c82307c64143ed2848e6ea1777ee51a40d3b978"; - sha256 = "07nid4wnd18bd26pl9y79427jsm4k602qph8090rkwl3h9b14w9x"; + rev = "067ec55a10ef8a58f8c7b45621daca759ab54437"; + sha256 = "1lm6jwsngqnhfh43r3s1qf2qynfd92d7pyp7a2myxcdzhcdhn08f"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3684,12 +3684,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-07-25"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c8a5ec7ec32c1fe1697437ad83bd26ba3b997abd"; - sha256 = "07qy81zpdh0wnxmiawj2yfbyvbvswvrlgj8pm95fwy7fvr7gbrnk"; + rev = "ef5a201caa05eba06f115515f9c4c8897045fe93"; + sha256 = "1h6dw1zwz57q4if2akfrwhvhgj0fcf1x5c3cax351sjq9gshx86h"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3744,12 +3744,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-08-06"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "0f6f0717c55a1e92b1e1a5f08f4bb03234a9bc39"; - sha256 = "1p4dvafi0kqxnfw46085jk14lk47hcippkw9b1lqi1kjimgxwwwg"; + rev = "d789c9ccba5c83c0fec6aa4e9cdac3803b5550e7"; + sha256 = "0wm9axsj9ns00xmiix83b2l6lqm2y7qyh81y851z32im9xjfxixk"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3768,12 +3768,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-08-06"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "2a9e67310b333eabf0a15acc0c78da42e9e8202e"; - sha256 = "1jv6pal9rvhn9lmc932g5fsj1g0s5sq3p22c1kk4xvzlhv8i6j69"; + rev = "e04105f551a982663b8d7707a064b733ab71db9b"; + sha256 = "0vfslh8qbl03c1prg5sfff6bxpyjbpdczxfc0r3i8hl9mwvdc4zx"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3792,12 +3792,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-06"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "8b1e79a1d04e4b077aab1706891ed48e397bcaea"; - sha256 = "093hc1n899d1w2x07vq0x2lx144w2w8acnlsis1pmqj4d2z9c0bf"; + rev = "d2d6e6251172a78436b7d2730a638e572f04b6ce"; + sha256 = "0b146fvcsg5i5x8bqmk9n1gfv9h158b6vss69pp47nr7jf7xfrfd"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4140,12 +4140,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-08-07"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "c0954d66fa658181c72733cda2991d258b47e816"; - sha256 = "1sjlffaymvci4lhrvnjndwnqbgm8n5379i14ipdjf0gqgd9xsczr"; + rev = "add255996af31fcec142cb28faa99998c2d5ac4e"; + sha256 = "0k7xsrs83fqm738lmnjcd5adyiw3ld26v0ybvg5wsydi0nirwryd"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4248,12 +4248,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-08-09"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "58a51d59999022fdc05a0b22428124b4f37c07ad"; - sha256 = "0yxydnvbzzfpyx8y6pqsnkb030nirdh12q138iixqy7l3j9p5jr9"; + rev = "adf9d62023e2d39d9d9a2bc550feb3ed7b545d0f"; + sha256 = "1h11a0lil14c13v5mdzdmxxqjpqip5fhvjbm34827czb5pz1hvcz"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4297,12 +4297,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-08-08"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "77227a06ecf84037277318758a8026524aa736ab"; - sha256 = "0x13p4pyby6g425cwm9b42qxknh1k27knf8hhn7jfgb4c5bdzk5a"; + rev = "e632306af10f28a662d53bafed85a8cf8b4f63b7"; + sha256 = "1sa8lc3xyb8sbmh0iwrh2r3j3rqnp5pjmi99h3i0ksm7yqcmkkk4"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4489,12 +4489,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-08-06"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "3ce2624dba442ae9bb04a5eeccd8aaef02f52ff2"; - sha256 = "0bb3mncvlm0mkn47s4mfz6rx63pq6ywvss0akz9zssph5jy1knga"; + rev = "fc070007d6c1c87a671db6632425004fa8a0b2e2"; + sha256 = "1bziyijfsm5q1m6bbp5m7nkki48f16nsiyibr178k9rlr2k6yccm"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4814,12 +4814,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-08-06"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "c76023c57a34e5cb0852f49061d5181a743db358"; - sha256 = "010cm39w3av8agk2d5z22vp8s1s13i17njbwvi56hyjmwsa706vf"; + rev = "0e1af11d2297ae65ba504419cd8d6bbd6ed3534d"; + sha256 = "1m6kzdyam2syly0abcjd3j4pimkmhvd9x1872lzw35bfqhbxq947"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4935,12 +4935,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-08-09"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "653b3dea6f2703dc450621df0589e3665a007656"; - sha256 = "0ppn7mwv5n46dwhslrpdganrfikcz57v425c5az01nm16n57rp5i"; + rev = "2e53ff98879fcdb41a011f5088bb2bbb070350f1"; + sha256 = "176jv5q2bln5gg7smh9f4dd3c2hc6pzskqjjx5pl45hmb4k0akjr"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -5273,12 +5273,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-08-06"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "273942cc478b356d7b2e0a5211281daaef69d161"; - sha256 = "1w2h6lvk5jz6v19m89cd019mbdz47b55qcx05nyx65j3jrn0n8av"; + rev = "d4a52ded6767ccda6c29e47332247003ac4c2007"; + sha256 = "15d996l9zbd300nrb946nfkw1b39v9qmzm1w2i8p4k11rclm77si"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5526,12 +5526,12 @@ final: prev: unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2021-05-24"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "62f7a3558ee4402bcaaae8638e768268f1137a0f"; - sha256 = "1y5inpiaqvnq69n1dbpiwilqfq2hf56m7w5a6kj2fkav15pyczx7"; + rev = "1fc0dd5dce6a0751903c69c629cc1d2f2cd114d5"; + sha256 = "04w6m1kkwyavnyq285pd83yab9zjq7zmnxkhaf2ipdh63pgfl6s8"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -5850,12 +5850,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-08-04"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "0cfd829c92a6fd208bfdcbdd2881105462224636"; - sha256 = "1jl6j7pq5klcr5rf2vmwrqvzx1y7paywhfw96dfk6397rxsga058"; + rev = "0de4c9df21abf9256091d205148601f718d3a12c"; + sha256 = "12k3kdxnmqhkb8f71cqrrf1xwphlcc7nbimlxkp7my5y75xrk6lx"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -6870,12 +6870,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-08-08"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "20618a61bc74f3f1a7fa165431b69685c01048c6"; - sha256 = "1z7r3zvhr2zcspqxgwgqskf4w2vwmb3ymvk2kl5r0r3paf305jck"; + rev = "9716765f2af3415ad1f9091a50c334649a74e4c5"; + sha256 = "1fclir7g02x8cpsyzf40l1igcw140h695g6mslyhhgjclm0rigpm"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -6930,12 +6930,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-08-09"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "4adf054a3f6f6ecad303e3e90c169cdf37f6c0e9"; - sha256 = "1vgv4im6bp7688cdwnfvkh5p1fl69bk83d2rsx733l6n45pczzfv"; + rev = "b709d9f782813565be57344538129cf00ea71463"; + sha256 = "0r2z1ahkvwsh54lsgm6r1hpj4bl639pazrf9w551zzw8h30najcl"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7054,8 +7054,8 @@ final: prev: src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "819cd8ff2006706b90f78da8fa4b5842b398bff9"; - sha256 = "1k0kz8s0km9k5cc0wagfbbclc21rjw29rzbrmd042ldv53ssq8ad"; + rev = "b8a824ae865032066793fb10c1c7d8a184a3a035"; + sha256 = "02dbmkr48cac0qbiqcgd1qblbj98a9pakmsr5kr54wa89s90bpxm"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -7869,12 +7869,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-07-25"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "80315c2933aa495b8af5833750e8534bf5b1d3bf"; - sha256 = "0f7j7cl7p8d5ac2wz7xhxzxgnm743wgb7360yav1pazivx0i5h5c"; + rev = "816751e279f1186d10520bad752206d5f91ce173"; + sha256 = "1z7gf14ifcza08yp0skdp1zad918fxpmws2p6b4zavmv4c6945ky"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8733,12 +8733,12 @@ final: prev: vim-scala = buildVimPluginFrom2Nix { pname = "vim-scala"; - version = "2019-06-24"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "derekwyatt"; repo = "vim-scala"; - rev = "bbdfea4b98fdb8866a8a6060ec1294643cfeb413"; - sha256 = "14q8j6vwqad2nwia29d0844v2zdcx04xn9dyicv13sdpivzcm4rb"; + rev = "7657218f14837395a4e6759f15289bad6febd1b4"; + sha256 = "0iypq4ii1lbnw6x4qc89vy8g8wq0gi06v96nphcc4fbs04pb4cr5"; }; meta.homepage = "https://github.com/derekwyatt/vim-scala/"; }; @@ -9430,12 +9430,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-07-23"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "54eaa1b19c924551e9988063926533583e41b24c"; - sha256 = "16d38yc4v0fy7w8qdrbx134f99xny4kfgwgazqa47cgj8nrb0n4g"; + rev = "3e28c3815c86637944e6425c444ab55cdd25528f"; + sha256 = "0b51mqizw4igzpjgs38pn9f0mn83hlalxv43swq3pkxray5vfav2"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -9742,12 +9742,12 @@ final: prev: vimagit = buildVimPluginFrom2Nix { pname = "vimagit"; - version = "2020-11-18"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "jreybert"; repo = "vimagit"; - rev = "aaf1278f03e866f0b978d4b0f0cc7084db251129"; - sha256 = "1k23q1p6wgjlk1cpmv1ijjggjklz8hgg6s7bx6mrk0aw5j2s1pdh"; + rev = "fb71060049f829e48fc392e0be43d1040c271204"; + sha256 = "1yizvf9s9djxar64kp63r45q5vv2k616xskd4adkcfqn8crzyw52"; }; meta.homepage = "https://github.com/jreybert/vimagit/"; }; @@ -9863,24 +9863,24 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-08-04"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "078292ed7efb95a5ff6c4cf21f4273ae599af2bd"; - sha256 = "0hk4wx89blvimw5vgkxri2ci4k2dhflwkj5mshc0k8v7bidli8m4"; + rev = "ae606455d79301f9091c1b6bde0ce87c17512312"; + sha256 = "13l4mli0qnsdillsgwc3f2810vy6mc388g54lc519c62yjc2r14h"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-05-25"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "a1650d5f9bc2d617bb546bb8014a206e41089dc8"; - sha256 = "0gdhhkpcq654c7jv5ycnss3fra2mysz3zl64n46cq17vmwczbcrh"; + rev = "031cc6208ed93788ce8d8d71b83c9d81fdddeeb3"; + sha256 = "1a5sgrnkyngwn2b771b8bm2awsq36yr5f17wclxg7fcms2y43lgv"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -9983,12 +9983,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder-nvim"; - version = "2021-08-07"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "719e83269062b7421a4e82f3d77263915b12d452"; - sha256 = "0qd66h72v4n8w9xh1dziihqhly44yn31r12a8pb19qy1fgqmrp78"; + rev = "8f15d62faab17f700798c4eabe75203a9bc4a6d2"; + sha256 = "0sicqzlvpiax38l46ccpnlfgsl8bkks9kn9b613v33n50j20bppc"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; From 7ad057c05f4357760d380d8c864bed8bc07e7d87 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Aug 2021 02:39:47 +0000 Subject: [PATCH 065/234] dasel: 1.17.0 -> 1.18.0 --- pkgs/applications/misc/dasel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index afe7572cbf7..af04d69cddf 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VZsYwsYec6Q9T8xkb60F0CvPVFd2WJgyOfegm5GuN8c="; + sha256 = "sha256-wp5GrOchNvGfQN9trcaq2hnhIHQ+W7zolvCzhCRDSqw="; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; From aaef193d5d6c58cce0d0bbc1223863090ff70279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 11 Aug 2021 11:58:00 +0200 Subject: [PATCH 066/234] notcurses: format, cleanup --- .../libraries/notcurses/default.nix | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index 725392772d8..a99a09a0fe6 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -1,13 +1,26 @@ -{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, readline, - fetchFromGitHub, lib, - multimediaSupport ? true +{ stdenv +, cmake +, pkg-config +, pandoc +, libunistring +, ncurses +, ffmpeg +, readline +, fetchFromGitHub +, lib +, multimediaSupport ? true }: -let - version = "2.3.8"; -in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "notcurses"; - inherit version; + version = "2.3.8"; + + src = fetchFromGitHub { + owner = "dankamongmen"; + repo = "notcurses"; + rev = "v${version}"; + sha256 = "sha256-CTMFXTmOnBUCm0KdVNBoDT08arr01XTHdELFiTayk3E="; + }; outputs = [ "out" "dev" ]; @@ -16,20 +29,11 @@ stdenv.mkDerivation { buildInputs = [ libunistring ncurses readline ] ++ lib.optional multimediaSupport ffmpeg; - cmakeFlags = - [ "-DUSE_QRCODEGEN=OFF" ] + cmakeFlags = [ "-DUSE_QRCODEGEN=OFF" ] ++ lib.optional (!multimediaSupport) "-DUSE_MULTIMEDIA=none"; - src = fetchFromGitHub { - owner = "dankamongmen"; - repo = "notcurses"; - rev = "v${version}"; - sha256 = "sha256-CTMFXTmOnBUCm0KdVNBoDT08arr01XTHdELFiTayk3E="; - }; - - meta = { + meta = with lib; { description = "blingful TUIs and character graphics"; - longDescription = '' A library facilitating complex TUIs on modern terminal emulators, supporting vivid colors, multimedia, and Unicode to the maximum degree @@ -39,11 +43,9 @@ stdenv.mkDerivation { It is not a source-compatible X/Open Curses implementation, nor a replacement for NCURSES on existing systems. ''; - homepage = "https://github.com/dankamongmen/notcurses"; - - license = lib.licenses.asl20; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ jb55 ]; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ jb55 ]; }; } From 31a04e99f61b1b571fd361b86b8766d75613e3ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 11 Aug 2021 11:59:42 +0200 Subject: [PATCH 067/234] meshcentral: substitute version --- pkgs/tools/admin/meshcentral/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 0214adb72c3..070d6ef8c21 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,9 +1,10 @@ { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: + yarn2nix-moretea.mkYarnPackage rec { version = "0.8.98"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-0.8.98.tgz"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz"; sha256 = "0120csvak07mkgaiq4sxyslcipgfgal0mhd8gwywcij2s71a3n26"; }; From 4b1bccf57a0fb278317980edbaf56d2d29c77050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 11 Aug 2021 12:46:58 +0200 Subject: [PATCH 068/234] sg3_utils: convert to pname + version --- pkgs/tools/system/sg3_utils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index 587bc7639a6..c3f698576d4 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -1,15 +1,16 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sg3_utils-1.46r862"; + pname = "sg3_utils"; + version = "1.46r862"; src = fetchurl { - url = "http://sg.danny.cz/sg/p/${name}.tgz"; + url = "http://sg.danny.cz/sg/p/sg3_utils-${version}.tgz"; sha256 = "sha256-s2UmU+p3s7Hoe+GFri2q+/3XLBICc+h04cxM86yaAs8="; }; meta = with lib; { - homepage = "http://sg.danny.cz/sg/"; + homepage = "https://sg.danny.cz/sg/"; description = "Utilities that send SCSI commands to devices"; platforms = platforms.linux; license = with licenses; [ bsd2 gpl2Plus ]; From db805c9d360d3d02c0c3dc7b6062174af48fdc5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 11 Aug 2021 13:14:29 +0200 Subject: [PATCH 069/234] smartmontools: format, cleanup --- pkgs/tools/system/smartmontools/default.nix | 33 +++++++++++++-------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index eb3c8dc2e0e..1658b4ea4df 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,17 +1,25 @@ -{ lib, stdenv, fetchurl, autoreconfHook -, enableMail ? false, mailutils, inetutils -, IOKit, ApplicationServices }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, enableMail ? false +, mailutils +, inetutils +, IOKit +, ApplicationServices +}: let dbrev = "5171"; drivedbBranch = "RELEASE_7_2_DRIVEDB"; driverdb = fetchurl { - url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; + url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; sha256 = "0vncr98xagbcfsxgfgxsip2qrl9q3y8va19qhv6yknlwbdfap4mn"; - name = "smartmontools-drivedb.h"; + name = "smartmontools-drivedb.h"; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "smartmontools"; version = "7.2"; @@ -24,10 +32,11 @@ in stdenv.mkDerivation rec { # fixes darwin build ./smartmontools.patch ]; - postPatch = "cp -v ${driverdb} drivedb.h"; + postPatch = '' + cp -v ${driverdb} drivedb.h + ''; - configureFlags = lib.optional enableMail - "--with-scriptpath=${lib.makeBinPath [ inetutils mailutils ]}"; + configureFlags = lib.optional enableMail "--with-scriptpath=${lib.makeBinPath [ inetutils mailutils ]}"; nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ]; @@ -35,10 +44,10 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Tools for monitoring the health of hard drives"; - homepage = "https://www.smartmontools.org/"; - license = licenses.gpl2Plus; + homepage = "https://www.smartmontools.org/"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ peti Frostman ]; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux ++ darwin; mainProgram = "smartctl"; }; } From 61fd76aabecc942b9b5f0b28e9d6e259dcdd0c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 11 Aug 2021 13:25:48 +0200 Subject: [PATCH 070/234] t1utils: switch to pname + version --- pkgs/tools/misc/t1utils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index ffa2c3408b9..d581b71d16e 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "t1utils-1.42"; + pname = "t1utils"; + version = "1.42"; src = fetchurl { - url = "https://www.lcdf.org/type/${name}.tar.gz"; + url = "https://www.lcdf.org/type/t1utils-${version}.tar.gz"; sha256 = "sha256-YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk="; }; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { resources from a Macintosh font file or create a Macintosh Type 1 font file from a PFA or PFB font. ''; - homepage = "http://www.lcdf.org/type/"; + homepage = "https://www.lcdf.org/type/"; # README from tarball says "BSD-like" and points to non-existing LICENSE # file... license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE From 1f29c36fe842c2012b74c07a772d17c4620e03b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 11 Aug 2021 16:55:01 +0200 Subject: [PATCH 071/234] bat: add SuperSandro2000 as maintainer --- pkgs/tools/misc/bat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 81b910117f1..423f1abd8b5 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sharkdp/bat"; changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir lilyball zowoq ]; + maintainers = with maintainers; [ dywedir lilyball zowoq SuperSandro2000 ]; }; } From f3339dff340a840dff6ec96d3c401b3e2047c78a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Aug 2021 03:55:44 +0000 Subject: [PATCH 072/234] flyctl: 0.0.230 -> 0.0.231 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index ccac1644b69..7d55bb82079 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.230"; + version = "0.0.231"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-TI6pBtpUfI1vPsi+tq7FduFaZv9CvkAooqFmHCGslzI="; + sha256 = "sha256-XBF1VVbVxShUL0BNYhM12or9GaHR0JF1pe6JflXtItw="; }; preBuild = '' From 907c5c2fa48ff3ced4b5640cafaea61acd3d3290 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Aug 2021 04:19:59 +0000 Subject: [PATCH 073/234] gbenchmark: 1.5.3 -> 1.5.6 --- pkgs/development/libraries/gbenchmark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 456e311a0bf..70bd37e40d3 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.5.3"; + version = "1.5.6"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "sha256-h/e2vJacUp7PITez9HPzGc5+ofz7Oplso44VibECmsI="; + sha256 = "sha256-DFm5cQh1b2BX6qCDaQZ1/XBNDeIYXKWbIETYu1EjDww="; }; nativeBuildInputs = [ cmake ]; From 0be46b5990ed93a190c7e0685a91fa253a5a6731 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 12 Aug 2021 06:27:34 +0000 Subject: [PATCH 074/234] electron_13: 13.1.8 -> 13.1.9 https://github.com/electron/electron/releases/tag/v13.1.9 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 2bc10265ebc..9886b013108 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,13 +115,13 @@ rec { headers = "0b66a7nbi1mybqy0j8x6hnp9k0jzvr6lpp4zsazhbfpk47px116y"; }; - electron_13 = mkElectron "13.1.8" { - x86_64-linux = "a4630aadd7e510e46ffe30632a69183b240bc19db226c83fab43e998d080e0ef"; - x86_64-darwin = "05c58efb89c69da53c8a512c2bd1ecb5996d996de16af3a2ed937e1f3bf126bb"; - i686-linux = "59e6d0d13640ee674a0b1ba96d51704eba8be1220fadf922832f6f52a72e12ec"; - armv7l-linux = "2b62f9874b4553782e8e5c7d7b667271fe4a5916adb2074a3b56ab9076076617"; - aarch64-linux = "2071c389cff1196e3ce1be4f5b486372003335bc132a2dbf4dc3b983dd26ee52"; - aarch64-darwin = "c870b31e30611a4d38557d6992bf5afe8d80f75548a427381aaf37d1d46af524"; - headers = "1q5gbsxrvf2mqfm91llkzcdlqg8lkpgxqxmzfmrm7na1r01lb4hr"; + electron_13 = mkElectron "13.1.9" { + x86_64-linux = "60c7c74a5dd00ebba6d6b5081a4b83d94ac97ec5e53488b8b8a1b9aabe17fefc"; + x86_64-darwin = "b897bdc42d9d1d0a49fc513c769603bff6e111389e2a626eb628257bc705f634"; + i686-linux = "081f08ce7ff0e1e8fb226a322b855f951d120aa522773f17dd8e5a87969b001f"; + armv7l-linux = "c6b6b538d4764104372539c511921ddecbf522ded1fea856cbc3d9a303a86206"; + aarch64-linux = "9166dd3e703aa8c9f75dfee91fb250b9a08a32d8181991c1143a1da5aa1a9f20"; + aarch64-darwin = "a1600c0321a0906761fdf88ab9f30d1c53b53803ca33bcae20a6ef7a6761cac1"; + headers = "1k9x9hgwl23sd5zsdrdlcjp4ap40g282a1dxs1jyxrwq1dzgmsl3"; }; } From 711d674e1322a8ccdbf985322468da87a141bc9c Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 13 Jul 2021 19:04:57 +0200 Subject: [PATCH 075/234] firefox: rename some attributes in packaging This should not change the derivation, but the new attribute names make more sense once we package something that is not Firefox using this expression. --- .../networking/browsers/firefox/common.nix | 44 ++++++------- .../networking/browsers/firefox/packages.nix | 15 ++--- .../networking/browsers/firefox/wrapper.nix | 64 +++++++++---------- pkgs/top-level/all-packages.nix | 6 +- 4 files changed, 63 insertions(+), 66 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 514447931f3..10d9d55e9ec 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,4 +1,5 @@ -{ pname, ffversion, meta, updateScript ? null +{ pname, version, meta, updateScript ? null +, binaryName ? "firefox", application ? "browser" , src, unpackPhase ? null, patches ? [] , extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [], tests ? [] }: @@ -81,17 +82,16 @@ let default-toolkit = if stdenv.isDarwin then "cairo-cocoa" else "cairo-gtk3${lib.optionalString waylandSupport "-wayland"}"; - binaryName = "firefox"; binaryNameCapitalized = lib.toUpper (lib.substring 0 1 binaryName) + lib.substring 1 (-1) binaryName; - browserName = if stdenv.isDarwin then binaryNameCapitalized else binaryName; + applicationName = if stdenv.isDarwin then binaryNameCapitalized else binaryName; execdir = if stdenv.isDarwin then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS" else "/bin"; # 78 ESR won't build with rustc 1.47 - inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45) + inherit (if lib.versionAtLeast version "82" then rustPackages else rustPackages_1_45) rustc cargo; # Darwin's stdenv provides the default llvmPackages version, match that since @@ -118,7 +118,7 @@ let # Disable p11-kit support in nss until our cacert packages has caught up exposing CKA_NSS_MOZILLA_CA_POLICY # https://github.com/NixOS/nixpkgs/issues/126065 - nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss.override { useP11kit = false; }; + nss_pkg = if lib.versionOlder version "83" then nss_3_53 else nss.override { useP11kit = false; }; # --enable-release adds -ffunction-sections & LTO that require a big amount of # RAM and the 32-bit memory space cannot handle that linking @@ -129,26 +129,26 @@ let in buildStdenv.mkDerivation ({ - name = "${pname}-unwrapped-${ffversion}"; - version = ffversion; + name = "${pname}-unwrapped-${version}"; + inherit version; inherit src unpackPhase meta; patches = [ ] ++ - lib.optional (lib.versionOlder ffversion "86") ./env_var_for_system_dir-ff85.patch ++ - lib.optional (lib.versionAtLeast ffversion "86") ./env_var_for_system_dir-ff86.patch ++ - lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++ - lib.optional (lib.versionAtLeast ffversion "90") ./no-buildconfig-ffx90.patch ++ - lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++ - lib.optional (ltoSupport && lib.versionAtLeast ffversion "84" && lib.versionOlder ffversion "86") + lib.optional (lib.versionOlder version "86") ./env_var_for_system_dir-ff85.patch ++ + lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ + lib.optional (lib.versionOlder version "83") ./no-buildconfig-ffx76.patch ++ + lib.optional (lib.versionAtLeast version "90") ./no-buildconfig-ffx90.patch ++ + lib.optional (ltoSupport && lib.versionOlder version "84") ./lto-dependentlibs-generation-ffx83.patch ++ + lib.optional (ltoSupport && lib.versionAtLeast version "84" && lib.versionOlder version "86") (fetchpatch { url = "https://hg.mozilla.org/mozilla-central/raw-rev/fdff20c37be3"; sha256 = "135n9brliqy42lj3nqgb9d9if7x6x9nvvn0z4anbyf89bikixw48"; }) # This patch adds pipewire support for the ESR release - ++ lib.optional (pipewireSupport && lib.versionOlder ffversion "83") + ++ lib.optional (pipewireSupport && lib.versionOlder version "83") (fetchpatch { # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch"; @@ -185,11 +185,11 @@ buildStdenv.mkDerivation ({ ++ lib.optional gssSupport libkrb5 ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional pipewireSupport pipewire - ++ lib.optional (lib.versionAtLeast ffversion "82") gnum4 + ++ lib.optional (lib.versionAtLeast version "82") gnum4 ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ] - ++ lib.optional (lib.versionOlder ffversion "90") gtk2; + ++ lib.optional (lib.versionOlder version "90") gtk2; NIX_LDFLAGS = lib.optionalString ltoSupport '' -rpath ${llvmPackages.libunwind.out}/lib @@ -201,14 +201,14 @@ buildStdenv.mkDerivation ({ rm -rf obj-x86_64-pc-linux-gnu substituteInPlace toolkit/xre/glxtest.cpp \ --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' - '' + lib.optionalString (pipewireSupport && lib.versionOlder ffversion "83") '' + '' + lib.optionalString (pipewireSupport && lib.versionOlder version "83") '' # substitute the /usr/include/ lines for the libraries that pipewire provides. # The patch we pick from fedora only contains the generated moz.build files # which hardcode the dependency paths instead of running pkg_config. substituteInPlace \ media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build \ --replace /usr/include ${pipewire.dev}/include - '' + lib.optionalString (lib.versionAtLeast ffversion "80" && lib.versionOlder ffversion "81") '' + '' + lib.optionalString (lib.versionAtLeast version "80" && lib.versionOlder version "81") '' substituteInPlace dom/system/IOUtils.h \ --replace '#include "nspr/prio.h"' '#include "prio.h"' @@ -276,7 +276,7 @@ buildStdenv.mkDerivation ({ ''; configureFlags = [ - "--enable-application=browser" + "--enable-application=${application}" "--with-system-jpeg" "--with-system-zlib" "--with-system-libevent" @@ -357,19 +357,19 @@ buildStdenv.mkDerivation ({ doInstallCheck = true; installCheckPhase = '' # Some basic testing - "$out${execdir}/${browserName}" --version + "$out${execdir}/${applicationName}" --version ''; passthru = { inherit updateScript; - version = ffversion; + inherit version; inherit alsaSupport; inherit pipewireSupport; inherit nspr; inherit ffmpegSupport; inherit gssSupport; inherit execdir; - inherit browserName; + inherit applicationName; inherit tests; inherit gtk3; }; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 33186ccba47..5d033fbf935 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,9 +7,9 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "91.0"; + version = "91.0"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; sha512 = "a02486a3996570e0cc815e92c98890bca1d27ce0018c2ee3d4bff9a6e54dbc8f5926fea8b5864f208e15389d631685b2add1e4e9e51146e40224d16d5c02f730"; }; @@ -27,15 +27,14 @@ rec { tests = [ nixosTests.firefox ]; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; - versionKey = "ffversion"; }; }; firefox-esr-91 = common rec { pname = "firefox-esr"; - ffversion = "91.0esr"; + version = "91.0esr"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; sha512 = "e518e1536094a1da44eb45b3b0f3adc1b5532f17da2dbcc994715419ec4fcec40574fdf633349a8e5de6382942f5706757a35f1b96b11de4754855b9cf7946ae"; }; @@ -53,15 +52,14 @@ rec { updateScript = callPackage ./update.nix { attrPath = "firefox-esr-91-unwrapped"; versionSuffix = "esr"; - versionKey = "ffversion"; }; }; firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.12.0esr"; + version = "78.12.0esr"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; sha512 = "646eb803e0d0e541773e3111708c7eaa85e784e4bae6e4a77dcecdc617ee29e2e349c9ef16ae7e663311734dd7491aebd904359124dda62672dbc18bfb608f0a"; }; @@ -79,7 +77,6 @@ rec { updateScript = callPackage ./update.nix { attrPath = "firefox-esr-78-unwrapped"; versionSuffix = "esr"; - versionKey = "ffversion"; }; }; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index c868369b603..0ef5233ff6b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -20,18 +20,18 @@ browser: let wrapper = - { browserName ? browser.browserName or (lib.getName browser) - , pname ? browserName + { applicationName ? browser.applicationName or (lib.getName browser) + , pname ? applicationName , version ? lib.getVersion browser - , desktopName ? # browserName with first letter capitalized - (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName) + , desktopName ? # applicationName with first letter capitalized + (lib.toUpper (lib.substring 0 1 applicationName) + lib.substring 1 (-1) applicationName) , nameSuffix ? "" - , icon ? browserName + , icon ? applicationName , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , forceWayland ? false , useGlvnd ? true - , cfg ? config.${browserName} or {} + , cfg ? config.${applicationName} or {} ## Following options are needed for extra prefs & policies # For more information about anti tracking (german website) @@ -40,7 +40,7 @@ let # For more information about policies visit # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled , extraPolicies ? {} - , firefoxLibName ? "firefox" # Important for tor package or the like + , libName ? "firefox" # Important for tor package or the like , nixExtensions ? null }: @@ -162,15 +162,15 @@ let "jre" ]; pluginsError = - "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; + "Your configuration mentions ${lib.concatMapStringsSep ", " (p: applicationName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; in if configPlugins != [] then throw pluginsError else (stdenv.mkDerivation { inherit pname version; desktopItem = makeDesktopItem { - name = browserName; - exec = "${browserName}${nameSuffix} %U"; + name = applicationName; + exec = "${applicationName}${nameSuffix} %U"; inherit icon; comment = ""; desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; @@ -193,12 +193,12 @@ let buildCommand = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - cp -R --no-preserve=mode,ownership ${browser}/Applications/${browserName}.app $out/Applications - rm -f $out${browser.execdir or "/bin"}/${browserName} + cp -R --no-preserve=mode,ownership ${browser}/Applications/${applicationName}.app $out/Applications + rm -f $out${browser.execdir or "/bin"}/${applicationName} '' + '' - if [ ! -x "${browser}${browser.execdir or "/bin"}/${browserName}" ] + if [ ! -x "${browser}${browser.execdir or "/bin"}/${applicationName}" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${browserName}'" + echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" exit 1 fi @@ -213,9 +213,9 @@ let cd "${browser}" find . -type d -exec mkdir -p "$out"/{} \; - find . -type f \( -not -name "${browserName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \; + find . -type f \( -not -name "${applicationName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \; - find . -type f -name "${browserName}" -print0 | while read -d $'\0' f; do + find . -type f -name "${applicationName}" -print0 | while read -d $'\0' f; do cp -P --no-preserve=mode,ownership "${browser}/$f" "$out/$f" chmod a+rwx "$out/$f" done @@ -236,11 +236,11 @@ let # create the wrapper executablePrefix="$out${browser.execdir or "/bin"}" - executablePath="$executablePrefix/${browserName}" + executablePath="$executablePrefix/${applicationName}" if [ ! -x "$executablePath" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${browserName}'" + echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" exit 1 fi @@ -249,25 +249,25 @@ let # Careful here, the file at executablePath may already be # a wrapper. That is why we postfix it with -old instead # of -wrapped. - oldExe="$executablePrefix"/".${browserName}"-old + oldExe="$executablePrefix"/".${applicationName}"-old mv "$executablePath" "$oldExe" else oldExe="$(readlink -v --canonicalize-existing "$executablePath")" fi - if [ ! -x "${browser}${browser.execdir or "/bin"}/${browserName}" ] + if [ ! -x "${browser}${browser.execdir or "/bin"}/${applicationName}" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${browserName}'" + echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" exit 1 fi makeWrapper "$oldExe" \ - "$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \ + "$out${browser.execdir or "/bin"}/${applicationName}${nameSuffix}" \ --prefix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --prefix PATH ':' "${xdg-utils}/bin" \ --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ - --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ + --set MOZ_APP_LAUNCHER "${applicationName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ @@ -290,7 +290,7 @@ let mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" ) if [ -e "$icon" ]; then ln -s "$icon" \ - "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png" + "$out/share/icons/hicolor/''${res}x''${res}/apps/${applicationName}.png" fi done fi @@ -314,24 +314,24 @@ let # # ######################### # user customization - mkdir -p $out/lib/${firefoxLibName} + mkdir -p $out/lib/${libName} # creating policies.json - mkdir -p "$out/lib/${firefoxLibName}/distribution" + mkdir -p "$out/lib/${libName}/distribution" - POL_PATH="$out/lib/${firefoxLibName}/distribution/policies.json" + POL_PATH="$out/lib/${libName}/distribution/policies.json" rm -f "$POL_PATH" cat ${policiesJson} >> "$POL_PATH" # preparing for autoconfig - mkdir -p "$out/lib/${firefoxLibName}/defaults/pref" + mkdir -p "$out/lib/${libName}/defaults/pref" - echo 'pref("general.config.filename", "mozilla.cfg");' > "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js" - echo 'pref("general.config.obscure_value", 0);' >> "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js" + echo 'pref("general.config.filename", "mozilla.cfg");' > "$out/lib/${libName}/defaults/pref/autoconfig.js" + echo 'pref("general.config.obscure_value", 0);' >> "$out/lib/${libName}/defaults/pref/autoconfig.js" - cat > "$out/lib/${firefoxLibName}/mozilla.cfg" < ${mozillaCfg} + cat > "$out/lib/${libName}/mozilla.cfg" < ${mozillaCfg} - mkdir -p $out/lib/${firefoxLibName}/distribution/extensions + mkdir -p $out/lib/${libName}/distribution/extensions ############################# # # diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cff389cf951..9d18dbbabb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24486,7 +24486,7 @@ with pkgs; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { - browserName = "firefox"; + applicationName = "firefox"; pname = "firefox-bin"; desktopName = "Firefox"; }; @@ -24497,7 +24497,7 @@ with pkgs; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { - browserName = "firefox"; + applicationName = "firefox"; pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -24508,7 +24508,7 @@ with pkgs; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { - browserName = "firefox"; + applicationName = "firefox"; nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; From 7c122d687b196cd87112cc92a1bfb7f908480fd5 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 12 Aug 2021 00:37:36 -0700 Subject: [PATCH 076/234] nixos/hqplayerd: sort options --- nixos/modules/services/audio/hqplayerd.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index 6eeaffce1b1..3da3635eb98 100644 --- a/nixos/modules/services/audio/hqplayerd.nix +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -14,17 +14,6 @@ in services.hqplayerd = { enable = mkEnableOption "HQPlayer Embedded"; - licenseFile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Path to the HQPlayer license key file. - - Without this, the service will run in trial mode and restart every 30 - minutes. - ''; - }; - auth = { username = mkOption { type = types.nullOr types.str; @@ -49,6 +38,17 @@ in }; }; + licenseFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to the HQPlayer license key file. + + Without this, the service will run in trial mode and restart every 30 + minutes. + ''; + }; + openFirewall = mkOption { type = types.bool; default = false; From 8757292004476cab9438e2dcaef527282b35a878 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Aug 2021 10:09:36 +0200 Subject: [PATCH 077/234] python3Packages.pyvicare: 2.4 -> 2.5.1 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index b9b983666a8..f8cf1961543 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.4"; + version = "2.5.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "1lih5hdyc3y0ickvfxd0gdgqv19zmqsfrnlxfwg8aqr73hl3ca8z"; + sha256 = "sha256-kddkVu1uj7/85wu5WHekbHewOxUq84bB6mk2pQHlFvY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 33372e8b752d6c19213e8e6e7badc83175dbfe7d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 5 Apr 2021 11:25:32 +0200 Subject: [PATCH 078/234] nixos/wireless: generate pretty configuration Turns this mess ctrl_interface=DIR=/run/wpa_supplicant GROUP=wheel update_config=1 network={ ssid="cool-network" psk="ciao" } network={ ssid="fancy-network" eap=PEAP identity="user@example.com" password="secret" } network={ ssid="free-network" key_mgmt=NONE } network={ ssid="raw-network" psk=fafafa } into something more human readable: network={ ssid="cool-network" psk="ciao" } network={ ssid="fancy-network" eap=PEAP identity="user@example.com" password="secret" } network={ ssid="free-network" key_mgmt=NONE } network={ ssid="raw-network" psk=fafafa } ctrl_interface=/run/wpa_supplicant ctrl_interface_group=wheel update_config=1 --- .../services/networking/wpa_supplicant.nix | 61 ++++++++++++------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 6238a351b99..56896e9c341 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -8,28 +8,44 @@ let else pkgs.wpa_supplicant; cfg = config.networking.wireless; - configFile = if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable then pkgs.writeText "wpa_supplicant.conf" '' - ${optionalString cfg.userControlled.enable '' - ctrl_interface=DIR=/run/wpa_supplicant GROUP=${cfg.userControlled.group} - update_config=1''} - ${cfg.extraConfig} - ${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let - key = if psk != null - then ''"${psk}"'' - else pskRaw; - baseAuth = if key != null - then "psk=${key}" - else "key_mgmt=NONE"; - in '' - network={ - ssid="${ssid}" - ${optionalString (priority != null) ''priority=${toString priority}''} - ${optionalString hidden "scan_ssid=1"} - ${if (auth != null) then auth else baseAuth} - ${extraConfig} - } - '') cfg.networks)} - '' else "/etc/wpa_supplicant.conf"; + + mkNetwork = ssid: opts: + let + quote = x: ''"${x}"''; + indent = x: " " + x; + + pskString = if opts.psk != null + then quote opts.psk + else opts.pskRaw; + + options = [ + "ssid=${quote ssid}" + ] ++ optional opts.hidden "scan_ssid=1" + ++ optional (pskString == null && opts.auth == null) "key_mgmt=NONE" + ++ optional (pskString != null) "psk=${pskString}" + ++ optionals (opts.auth != null) (filter (x: x != "") (splitString "\n" opts.auth)) + ++ optional (opts.priority != null) "priority=${toString opts.priority}" + ++ optional (opts.extraConfig != "") opts.extraConfig; + in '' + network={ + ${concatMapStringsSep "\n" indent options} + } + ''; + + generatedConfig = concatStringsSep "\n" ( + (mapAttrsToList mkNetwork cfg.networks) + ++ optional cfg.userControlled.enable (concatStringsSep "\n" + [ "ctrl_interface=/run/wpa_supplicant" + "ctrl_interface_group=${cfg.userControlled.group}" + "update_config=1" + ]) + ++ optional (cfg.extraConfig != "") cfg.extraConfig); + + configFile = + if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable + then pkgs.writeText "wpa_supplicant.conf" generatedConfig + else "/etc/wpa_supplicant.conf"; + in { options = { networking.wireless = { @@ -200,6 +216,7 @@ in { description = "Members of this group can control wpa_supplicant."; }; }; + extraConfig = mkOption { type = types.str; default = ""; From bef963963a7c4146daac7f965b2ebb02cccb8364 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 5 Apr 2021 11:37:51 +0200 Subject: [PATCH 079/234] nixos/wireless: add options for better roaming - Add an option to automatically launch a scan when the signal of the current network is low - Enable 802.11r (fast access point transition) by default for all protected networks --- .../services/networking/wpa_supplicant.nix | 58 ++++++++++++++++++- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 56896e9c341..0bd44fd1317 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -20,8 +20,10 @@ let options = [ "ssid=${quote ssid}" + (if pskString != null || opts.auth != null + then "key_mgmt=${concatStringsSep " " opts.authProtocols}" + else "key_mgmt=NONE") ] ++ optional opts.hidden "scan_ssid=1" - ++ optional (pskString == null && opts.auth == null) "key_mgmt=NONE" ++ optional (pskString != null) "psk=${pskString}" ++ optionals (opts.auth != null) (filter (x: x != "") (splitString "\n" opts.auth)) ++ optional (opts.priority != null) "priority=${toString opts.priority}" @@ -39,6 +41,7 @@ let "ctrl_interface_group=${cfg.userControlled.group}" "update_config=1" ]) + ++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"'' ++ optional (cfg.extraConfig != "") cfg.extraConfig); configFile = @@ -77,6 +80,16 @@ in { ''; }; + scanOnLowSignal = mkOption { + type = types.bool; + default = true; + description = '' + Whether to periodically scan for (better) networks when the signal of + the current one is low. This will make roaming between access points + faster, but will consume more power. + ''; + }; + networks = mkOption { type = types.attrsOf (types.submodule { options = { @@ -105,11 +118,52 @@ in { ''; }; + authProtocols = mkOption { + default = [ + # WPA2 and WPA3 + "WPA-PSK" "WPA-EAP" "SAE" + # 802.11r variants of the above + "FT-PSK" "FT-EAP" "FT-SAE" + ]; + # The list can be obtained by running this command + # awk ' + # /^# key_mgmt: /{ run=1 } + # /^#$/{ run=0 } + # /^# [A-Z0-9-]{2,}/{ if(run){printf("\"%s\"\n", $2)} } + # ' /run/current-system/sw/share/doc/wpa_supplicant/wpa_supplicant.conf.example + type = types.listOf (types.enum [ + "WPA-PSK" + "WPA-EAP" + "IEEE8021X" + "NONE" + "WPA-NONE" + "FT-PSK" + "FT-EAP" + "FT-EAP-SHA384" + "WPA-PSK-SHA256" + "WPA-EAP-SHA256" + "SAE" + "FT-SAE" + "WPA-EAP-SUITE-B" + "WPA-EAP-SUITE-B-192" + "OSEN" + "FILS-SHA256" + "FILS-SHA384" + "FT-FILS-SHA256" + "FT-FILS-SHA384" + "OWE" + "DPP" + ]); + description = '' + The list of authentication protocols accepted by this network. + This corresponds to the key_mgmt option in wpa_supplicant. + ''; + }; + auth = mkOption { type = types.nullOr types.str; default = null; example = '' - key_mgmt=WPA-EAP eap=PEAP identity="user@example.com" password="secret" From 8b1c14045d51873023a101aa1376f5e238114c4a Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 13 Jul 2021 19:13:53 +0200 Subject: [PATCH 080/234] thunderbird: use firefox expression --- .../mailreaders/thunderbird/default.nix | 357 ------------------ .../thunderbird/no-buildconfig-78.patch | 13 + .../thunderbird/no-buildconfig.patch | 37 -- .../mailreaders/thunderbird/packages.nix | 38 ++ .../mailreaders/thunderbird/wrapper.nix | 23 ++ pkgs/top-level/all-packages.nix | 25 +- pkgs/top-level/release.nix | 2 +- 7 files changed, 90 insertions(+), 405 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/default.nix create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-78.patch delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/packages.nix create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix deleted file mode 100644 index a5a8ab861ed..00000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ /dev/null @@ -1,357 +0,0 @@ -{ autoconf213 -, bzip2 -, cargo -, common-updater-scripts -, copyDesktopItems -, coreutils -, curl -, dbus -, dbus-glib -, fetchpatch -, fetchurl -, file -, fontconfig -, freetype -, glib -, gnugrep -, gnupg -, gnused -, gpgme -, icu -, jemalloc -, lib -, libevent -, libGL -, libGLU -, libjpeg -, libnotify -, libpng -, libstartup_notification -, libvpx -, libwebp -, llvmPackages -, m4 -, makeDesktopItem -, nasm -, nodejs -, nspr -, nss_3_53 -, pango -, perl -, pkg-config -, python2 -, python3 -, runtimeShell -, rust-cbindgen -, rustc -, sqlite -, stdenv -, systemd -, unzip -, which -, writeScript -, xdg-utils -, xidel -, xorg -, yasm -, zip -, zlib - -, debugBuild ? false - -, alsaSupport ? stdenv.isLinux, alsa-lib -, pulseaudioSupport ? stdenv.isLinux, libpulseaudio -, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook -, waylandSupport ? true, libdrm -, libxkbcommon, calendarSupport ? true - -# Use official trademarked branding. Permission obtained at: -# https://github.com/NixOS/nixpkgs/pull/94880#issuecomment-675907971 -, enableOfficialBranding ? true -}: - -assert waylandSupport -> gtk3Support == true; - -stdenv.mkDerivation rec { - pname = "thunderbird"; - version = "78.13.0"; - - src = fetchurl { - url = - "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = - "daee9ea9e57bdfce231a35029807f279a06f8790d71efc8998c78eb42d99a93cf98623170947df99202da038f949ba9111a7ff7adbd43c161794deb6791370a0"; - }; - - nativeBuildInputs = [ - autoconf213 - cargo - copyDesktopItems - gnused - llvmPackages.llvm - m4 - nasm - nodejs - perl - pkg-config - python2 - python3 - rust-cbindgen - rustc - which - yasm - unzip - ] ++ lib.optional gtk3Support wrapGAppsHook; - - buildInputs = [ - bzip2 - dbus - dbus-glib - file - fontconfig - freetype - glib - gtk2 - icu - jemalloc - libGL - libGLU - libevent - libjpeg - libnotify - libpng - libstartup_notification - libvpx - libwebp - nspr - nss_3_53 - pango - perl - sqlite - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcursor - xorg.libXext - xorg.libXft - xorg.libXi - xorg.libXrender - xorg.libXt - xorg.pixman - xorg.xorgproto - xorg.libXdamage - zip - zlib - ] ++ lib.optional alsaSupport alsa-lib - ++ lib.optional gtk3Support gtk3 - ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]; - - NIX_CFLAGS_COMPILE =[ - "-I${glib.dev}/include/gio-unix-2.0" - "-I${nss_3_53.dev}/include/nss" - ]; - - patches = [ - ./no-buildconfig.patch - ]; - - postPatch = '' - rm -rf obj-x86_64-pc-linux-gnu - ''; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - # remove distributed configuration files - rm -f configure - rm -f js/src/configure - rm -f .mozconfig* - - configureScript="$(realpath ./mach) configure" - # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 - unset AS - - export MOZCONFIG=$(pwd)/mozconfig - - # Set C flags for Rust's bindgen program. Unlike ordinary C - # compilation, bindgen does not invoke $CC directly. Instead it - # uses LLVM's libclang. To make sure all necessary flags are - # included we need to look in a few places. - # TODO: generalize this process for other use-cases. - - BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-crt1-cflags) \ - $(< ${stdenv.cc}/nix-support/libc-cflags) \ - $(< ${stdenv.cc}/nix-support/cc-cflags) \ - $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ - ${ - lib.optionalString stdenv.cc.isClang - "-idirafter ${stdenv.cc.cc}/lib/clang/${ - lib.getVersion stdenv.cc.cc - }/include" - } \ - ${ - lib.optionalString stdenv.cc.isGNU - "-isystem ${stdenv.cc.cc}/include/c++/${ - lib.getVersion stdenv.cc.cc - } -isystem ${stdenv.cc.cc}/include/c++/${ - lib.getVersion stdenv.cc.cc - }/${stdenv.hostPlatform.config}" - } \ - $NIX_CFLAGS_COMPILE" - - echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG - ''; - - configureFlags = let - toolkitSlug = if gtk3Support then - "3${lib.optionalString waylandSupport "-wayland"}" - else - "2"; - toolkitValue = "cairo-gtk${toolkitSlug}"; - in [ - "--enable-application=comm/mail" - - "--with-system-icu" - "--with-system-jpeg" - "--with-system-libevent" - "--with-system-nspr" - "--with-system-nss" - "--with-system-png" # needs APNG support - "--with-system-zlib" - "--with-system-webp" - "--with-system-libvpx" - - "--enable-rust-simd" - "--enable-crashreporter" - "--enable-default-toolkit=${toolkitValue}" - "--enable-js-shell" - "--enable-necko-wifi" - "--enable-system-ffi" - "--enable-system-pixman" - - "--disable-tests" - "--disable-updater" - "--enable-jemalloc" - ] ++ (if debugBuild then [ - "--enable-debug" - "--enable-profiling" - ] else [ - "--disable-debug" - "--enable-release" - "--disable-debug-symbols" - "--enable-optimize" - "--enable-strip" - ]) ++ lib.optionals (!stdenv.hostPlatform.isi686) [ - # on i686-linux: --with-libclang-path is not available in this configuration - "--with-libclang-path=${llvmPackages.libclang.lib}/lib" - "--with-clang-path=${llvmPackages.clang}/bin/clang" - ] ++ lib.optional alsaSupport "--enable-alsa" - ++ lib.optional calendarSupport "--enable-calendar" - ++ lib.optional enableOfficialBranding "--enable-official-branding" - ++ lib.optional pulseaudioSupport "--enable-pulseaudio"; - - enableParallelBuilding = true; - - postConfigure = '' - cd obj-* - ''; - - makeFlags = lib.optionals enableOfficialBranding [ - "MOZILLA_OFFICIAL=1" - "BUILD_OFFICIAL=1" - ]; - - doCheck = false; - - desktopItems = [ - (makeDesktopItem { - categories = lib.concatStringsSep ";" [ "Application" "Network" ]; - desktopName = "Thunderbird"; - genericName = "Mail Reader"; - name = "thunderbird"; - exec = "thunderbird %U"; - icon = "thunderbird"; - mimeType = lib.concatStringsSep ";" [ - # Email - "x-scheme-handler/mailto" - "message/rfc822" - # Feeds - "x-scheme-handler/feed" - "application/rss+xml" - "application/x-extension-rss" - # Newsgroups - "x-scheme-handler/news" - "x-scheme-handler/snews" - "x-scheme-handler/nntp" - ]; - }) - ]; - - postInstall = '' - # TODO: Move to a dev output? - rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl - install -Dm 444 $out/lib/thunderbird/chrome/icons/default/default256.png $out/share/icons/hicolor/256x256/apps/thunderbird.png - ''; - - # Note on GPG support: - # Thunderbird's native GPG support does not yet support smartcards. - # The official upstream recommendation is to configure fall back to gnupg - # using the Thunderbird config `mail.openpgp.allow_external_gnupg` - # and GPG keys set up; instructions with pictures at: - # https://anweshadas.in/how-to-use-yubikey-or-any-gpg-smartcard-in-thunderbird-78/ - # For that to work out of the box, it requires `gnupg` on PATH and - # `gpgme` in `LD_LIBRARY_PATH`; we do this below. - - preFixup = '' - # Needed to find Mozilla runtime - gappsWrapperArgs+=( - --argv0 "$out/bin/thunderbird" - --set MOZ_APP_LAUNCHER thunderbird - # https://github.com/NixOS/nixpkgs/pull/61980 - --set SNAP_NAME "thunderbird" - --set MOZ_LEGACY_PROFILES 1 - --set MOZ_ALLOW_DOWNGRADE 1 - --prefix PATH : "${lib.getBin gnupg}/bin" - --prefix PATH : "${lib.getBin xdg-utils}/bin" - --prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib" - ) - ''; - - # FIXME: The XUL portion of this can probably be removed as soon as we - # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? - postFixup = '' - local xul="$out/lib/thunderbird/libxul.so" - patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul - ''; - - doInstallCheck = true; - installCheckPhase = '' - "$out/bin/thunderbird" --version - ''; - - disallowedRequisites = [ - stdenv.cc - ]; - - passthru.updateScript = import ./../../browsers/firefox/update.nix { - attrPath = "thunderbird-78"; - baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; - inherit writeScript lib common-updater-scripts xidel coreutils gnused - gnugrep gnupg curl runtimeShell; - }; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "A full-featured e-mail client"; - homepage = "https://www.thunderbird.net"; - maintainers = with maintainers; [ - eelco - lovesegfault - pierron - vcunat - ]; - platforms = platforms.linux; - license = licenses.mpl20; - }; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-78.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-78.patch new file mode 100644 index 00000000000..98b40d83d62 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-78.patch @@ -0,0 +1,13 @@ +Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. +--- a/comm/mail/base/jar.mn ++++ b/comm/mail/base/jar.mn +@@ -119,9 +119,7 @@ + % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js + % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml + +-* content/messenger/buildconfig.html (content/buildconfig.html) + content/messenger/buildconfig.css (content/buildconfig.css) +-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html + % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css + + # L10n resources and overrides. diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch deleted file mode 100644 index d413a06475d..00000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch +++ /dev/null @@ -1,37 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. -diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp ---- a/docshell/base/nsAboutRedirector.cpp -+++ b/docshell/base/nsAboutRedirector.cpp -@@ -63,8 +63,6 @@ - {"about", "chrome://global/content/aboutAbout.html", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", - nsIAboutModule::ALLOW_SCRIPT}, -- {"buildconfig", "chrome://global/content/buildconfig.html", -- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT}, -diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn ---- a/toolkit/content/jar.mn -+++ b/toolkit/content/jar.mn -@@ -35,7 +35,6 @@ - content/global/plugins.js - content/global/browser-child.js - content/global/browser-content.js --* content/global/buildconfig.html - content/global/buildconfig.css - content/global/contentAreaUtils.js - content/global/datepicker.xhtml -diff -ru -x '*~' a/comm/mail/base/jar.mn b/comm/mail/base/jar.mn ---- a/comm/mail/base/jar.mn -+++ b/comm/mail/base/jar.mn -@@ -119,9 +119,7 @@ - % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml - --* content/messenger/buildconfig.html (content/buildconfig.html) - content/messenger/buildconfig.css (content/buildconfig.css) --% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html - % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css - - # L10n resources and overrides. diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix new file mode 100644 index 00000000000..c367a9303b5 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests }: + +let + common = opts: callPackage (import ../../browsers/firefox/common.nix opts) { + webrtcSupport = false; + geolocationSupport = false; + }; +in + +rec { + thunderbird = common rec { + pname = "thunderbird"; + version = "78.13.0"; + application = "comm/mail"; + binaryName = pname; + src = fetchurl { + url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; + sha512 = "daee9ea9e57bdfce231a35029807f279a06f8790d71efc8998c78eb42d99a93cf98623170947df99202da038f949ba9111a7ff7adbd43c161794deb6791370a0"; + }; + patches = [ + ./no-buildconfig-78.patch + ]; + + meta = with lib; { + description = "A full-featured e-mail client"; + homepage = "https://thunderbird.net/"; + maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; + platforms = platforms.unix; + badPlatforms = platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + license = licenses.mpl20; + }; + updateScript = callPackage ./update.nix { + attrPath = "thunderbird-78-unwrapped"; + }; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix b/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix new file mode 100644 index 00000000000..0761232cc51 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix @@ -0,0 +1,23 @@ +{ lib, wrapFirefox, gpgme, gnupg }: + +browser: +args: + +(wrapFirefox browser ({ + libName = "thunderbird"; +} // args)) + +.overrideAttrs (old: { + # Thunderbird's native GPG support does not yet support smartcards. + # The official upstream recommendation is to configure fall back to gnupg + # using the Thunderbird config `mail.openpgp.allow_external_gnupg` + # and GPG keys set up; instructions with pictures at: + # https://anweshadas.in/how-to-use-yubikey-or-any-gpg-smartcard-in-thunderbird-78/ + # For that to work out of the box, it requires `gnupg` on PATH and + # `gpgme` in `LD_LIBRARY_PATH`; we do this below. + buildCommand = old.buildCommand + '' + wrapProgram $out/bin/thunderbird \ + --prefix LD_LIBRARY_PATH ':' "${lib.makeLibraryPath [ gpgme ]}" \ + --prefix PATH ':' "${lib.makeBinPath [ gnupg ]}" + ''; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d18dbbabb1..ae4090c808c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27646,17 +27646,20 @@ with pkgs; thonny = callPackage ../applications/editors/thonny { }; - thunderbird = thunderbird-78; + thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix { + callPackage = pkgs.newScope { + inherit (rustPackages) cargo rustc; + libpng = libpng_apng; + gnused = gnused_422; + inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling + Kerberos AVFoundation MediaToolbox + CoreLocation Foundation AddressBook; + inherit (darwin) libobjc; + }; + }); - thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird { - # Using older Rust for workaround: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1663715 - inherit (rustPackages_1_45) cargo rustc; - libpng = libpng_apng; - icu = icu67; - libvpx = libvpx_1_8; - gtk3Support = true; - }; + thunderbird-unwrapped = thunderbirdPackages.thunderbird; + thunderbird = wrapThunderbird thunderbird-unwrapped { }; thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; @@ -28276,6 +28279,8 @@ with pkgs; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; + wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { }; + wp-cli = callPackage ../development/tools/wp-cli { }; retroArchCores = diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index dfb3b639b27..571d345d21e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -104,7 +104,7 @@ let jobs.nix-info.x86_64-linux jobs.nix-info-tested.x86_64-linux # Ensure that X11/GTK are in order. - jobs.thunderbird.x86_64-linux + jobs.thunderbird-unwrapped.x86_64-linux jobs.cachix.x86_64-linux /* From fb9860709c256a2bc348cb31cd61e64c4f2cfc97 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 13 Jul 2021 19:15:12 +0200 Subject: [PATCH 081/234] thunderbird: 78.13.0 -> 91.0 --- .../thunderbird/no-buildconfig-90.patch | 13 +++++++++ .../mailreaders/thunderbird/packages.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch new file mode 100644 index 00000000000..c4e29f6355c --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch @@ -0,0 +1,13 @@ +Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. +--- a/comm/mail/base/jar.mn ++++ b/comm/mail/base/jar.mn +@@ -119,9 +119,6 @@ messenger.jar: + % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js + % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml + +-* content/messenger/buildconfig.html (content/buildconfig.html) +-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html +- + # L10n resources and overrides. + % override chrome://mozapps/locale/profile/profileDowngrade.dtd chrome://messenger/locale/profileDowngrade.dtd + % override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index c367a9303b5..1f94b3eb977 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -9,6 +9,34 @@ in rec { thunderbird = common rec { + pname = "thunderbird"; + version = "91.0"; + application = "comm/mail"; + binaryName = pname; + src = fetchurl { + url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; + sha512 = "f3fcaff97b37ef41850895e44fbd2f42b0f1cb982542861bef89ef7ee606c6332296d61f666106be9455078933a2844c46bf243b71cc4364d9ff457d9c808a7a"; + }; + patches = [ + ./no-buildconfig-90.patch + ]; + + meta = with lib; { + description = "A full-featured e-mail client"; + homepage = "https://thunderbird.net/"; + maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; + platforms = platforms.unix; + badPlatforms = platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + license = licenses.mpl20; + }; + updateScript = callPackage ./update.nix { + attrPath = "thunderbird-unwrapped"; + }; + }; + + thunderbird-78 = common rec { pname = "thunderbird"; version = "78.13.0"; application = "comm/mail"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae4090c808c..325fc9dd545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27659,7 +27659,10 @@ with pkgs; }); thunderbird-unwrapped = thunderbirdPackages.thunderbird; + thunderbird-78-unwrapped = thunderbirdPackages.thunderbird-78; thunderbird = wrapThunderbird thunderbird-unwrapped { }; + thunderbird-78 = wrapThunderbird thunderbird-78-unwrapped { }; + thunderbird-wayland = wrapThunderbird thunderbird-unwrapped { forceWayland = true; }; thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; From 8de09802e08c72a541208a6e39d38dc483291f62 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Aug 2021 00:15:12 +0200 Subject: [PATCH 082/234] =?UTF-8?q?ocamlPackages.ppx=5Ftools:=206.3=20?= =?UTF-8?q?=E2=86=92=206.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds support for OCaml 4.13 --- .../ocaml-modules/ppx_tools/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 8097c9145e4..64948c29ae5 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }: let param = - let v6_3 = { - version = "6.3"; - sha256 = "1skf4njvkifwx0qlsrc0jn891gvvcp5ryd6kkpx56hck7nnxv8x6"; + let v6_4 = { + version = "6.4"; + sha256 = "15v7yfv6gyp8lzlgwi9garz10wpg34dk4072jdv19n6v20zfg7n1"; useDune2 = true; buildInputs = [cppo]; }; in @@ -27,11 +27,12 @@ let param = "4.07" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; - "4.08" = v6_3; - "4.09" = v6_3; - "4.10" = v6_3; - "4.11" = v6_3; - "4.12" = v6_3; + "4.08" = v6_4; + "4.09" = v6_4; + "4.10" = v6_4; + "4.11" = v6_4; + "4.12" = v6_4; + "4.13" = v6_4; }.${ocaml.meta.branch}; in From 10a0b42996a75f8f09108b5f483a41d11e062875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 12 Aug 2021 11:30:23 +0200 Subject: [PATCH 083/234] fontforge: remove ? null on darwin packages and format a little --- pkgs/tools/misc/fontforge/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 5f64057c46c..0f66fa55aca 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -7,7 +7,7 @@ , withGUI ? withGTK , withPython ? true , withExtras ? true -, Carbon ? null, Cocoa ? null +, Carbon, Cocoa }: assert withGTK -> withGUI; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { readline uthash woff2 zeromq libuninameslist python freetype zlib glib giflib libpng libjpeg libtiff libxml2 ] - ++ lib.optionals withSpiro [libspiro] + ++ lib.optionals withSpiro [ libspiro ] ++ lib.optionals withGUI [ gtk3 cairo pango ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; @@ -71,11 +71,11 @@ stdenv.mkDerivation rec { rm -r "$out/share/fontforge/python" ''; - meta = { + meta = with lib; { description = "A font editor"; - homepage = "http://fontforge.github.io"; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.erictapen ]; + homepage = "https://fontforge.github.io"; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = [ maintainers.erictapen ]; }; } From e24327a975028d64a7e3da466b25268c5e5428c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Aug 2021 11:31:06 +0200 Subject: [PATCH 084/234] tfsec: 0.57.1 -> 0.58.0 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index edcaddbd9ce..d6b56b4ccff 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.57.1"; + version = "0.58.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0g3yq2y9z7vnaznmdmdb98djsv8nbai8jvbhfs2g12q55dlm3vf3"; + sha256 = "sha256-aQlsqmssF9Be4vaUfBZxNQAyg6MsS3lAooalPQKRns0="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From b43049dbd7e6a4effac6257d264fb2e1107df4b6 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 12 Aug 2021 02:36:42 -0700 Subject: [PATCH 085/234] nixos/hqplayerd: also open controller port --- nixos/modules/services/audio/hqplayerd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index 3da3635eb98..64a6436e670 100644 --- a/nixos/modules/services/audio/hqplayerd.nix +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -53,7 +53,7 @@ in type = types.bool; default = false; description = '' - Open TCP port 8088 in the firewall for the server. + Opens ports needed for the WebUI and controller API. ''; }; }; @@ -77,7 +77,7 @@ in }; networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ 8088 ]; + allowedTCPPorts = [ 8088 4321 ]; }; services.udev.packages = [ pkg ]; From e5aa9403053aec8b9aafe38acd4aeb79a6c86490 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 12 Aug 2021 02:37:38 -0700 Subject: [PATCH 086/234] nixos/hqplayerd: allow configuration from Nix --- nixos/modules/services/audio/hqplayerd.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index 64a6436e670..ed8de390417 100644 --- a/nixos/modules/services/audio/hqplayerd.nix +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -56,6 +56,16 @@ in Opens ports needed for the WebUI and controller API. ''; }; + + config = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + HQplayer daemon configuration, written to /etc/hqplayer/hqplayerd.xml. + + Refer to ${pkg}/share/doc/hqplayerd/readme.txt for possible values. + ''; + }; }; }; @@ -70,6 +80,7 @@ in environment = { etc = { + "hqplayer/hqplayerd.xml" = mkIf (cfg.config != null) { source = pkgs.writeText "hqplayerd.xml" cfg.config; }; "hqplayer/hqplayerd4-key.xml" = mkIf (cfg.licenseFile != null) { source = cfg.licenseFile; }; "modules-load.d/taudio2.conf".source = "${pkg}/etc/modules-load.d/taudio2.conf"; }; @@ -99,6 +110,8 @@ in unitConfig.ConditionPathExists = [ configDir stateDir ]; + restartTriggers = [ config.environment.etc."hqplayer/hqplayerd.xml".source ]; + preStart = '' cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}" chmod -R u+wX "${stateDir}/web" From 56a8ffa91402e9051a492cd840ee91a2de5f4cf4 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Thu, 12 Aug 2021 11:45:52 +0200 Subject: [PATCH 087/234] =?UTF-8?q?sieve-connect:=20Don=E2=80=99t=20manual?= =?UTF-8?q?ly=20gzip=20manpage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit as advised by @dasJ in https://github.com/NixOS/nixpkgs/pull/133596#discussion_r687514056 --- pkgs/applications/networking/sieve-connect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix index d4866d9f1a4..11a9a4fbc2a 100644 --- a/pkgs/applications/networking/sieve-connect/default.nix +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share/man/man1 install -m 755 sieve-connect $out/bin - gzip -c sieve-connect.1 > $out/share/man/man1/sieve-connect.1.gz + install -m 644 sieve-connect.1 $out/share/man/man1 wrapProgram $out/bin/sieve-connect \ --prefix PERL5LIB : "${with perlPackages; makePerlPath [ From a82078dd053c83a039fbc3932fdae20194ba5253 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Thu, 12 Aug 2021 11:55:21 +0200 Subject: [PATCH 088/234] vlang: use shipped Makefile instead of custom buildPhase (#128527) Co-authored-by: Sandro --- pkgs/development/compilers/vlang/default.nix | 24 +++++++++----------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 326fb9eff7d..1535411149d 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -1,6 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, upx ? null }: - -assert stdenv.hostPlatform.isUnix -> upx != null; +{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx }: stdenv.mkDerivation rec { pname = "vlang"; @@ -25,16 +23,15 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glfw freetype openssl ] ++ lib.optional stdenv.hostPlatform.isUnix upx; - buildPhase = '' - runHook preBuild - cc -std=gnu11 $CFLAGS -w -o v $vc/v.c -lm $LDFLAGS - # vlang seems to want to write to $HOME/.vmodules, - # so lets give it a writable HOME - HOME=$PWD ./v -prod self - # Exclude thirdparty/vschannel as it is windows-specific. - find thirdparty -path thirdparty/vschannel -prune -o -type f -name "*.c" -execdir cc -std=gnu11 $CFLAGS -w -c {} $LDFLAGS ';' - runHook postBuild - ''; + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ + "local=1" + "VC=${vc}" + # vlang seems to want to write to $HOME/.vmodules , so lets give + # it a writable HOME + "HOME=$TMPDIR" + ]; installPhase = '' runHook preInstall @@ -43,6 +40,7 @@ stdenv.mkDerivation rec { cp -r {cmd,vlib,thirdparty} $out/lib mv v $out/lib ln -s $out/lib/v $out/bin/v + wrapProgram $out/bin/v --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} runHook postInstall ''; From 0a31b7df57015f10505103c66b038d0b809ca5f4 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 12 Aug 2021 12:13:10 +0200 Subject: [PATCH 089/234] nixos/ssh: cleanup UseDNS setting --- nixos/modules/services/networking/ssh/sshd.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 2c96b94ca43..5e945df3a7a 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -553,11 +553,7 @@ in LogLevel ${cfg.logLevel} - ${if cfg.useDns then '' - UseDNS yes - '' else '' - UseDNS no - ''} + UseDNS ${if cfg.useDns then "yes" else "no"} ''; From 84eba0ab8449ebb04451e5f401b2a830d6a00cfa Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Thu, 12 Aug 2021 09:27:13 +0000 Subject: [PATCH 090/234] lightning-loop: 0.14.2-beta -> 0.15.0-beta --- pkgs/applications/blockchains/lightning-loop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix index f14af0ae796..f33b005cdd9 100644 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.14.2-beta"; + version = "0.15.0-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "02ndln0n5k2pin9pngjcmn3wak761ml923111fyqb379zcfscrfv"; + sha256 = "1yjc04jiam3836w7vn3b1jqj1dq1k8wwfnccir0vh29cn6v0cf63"; }; - vendorSha256 = "1izdd9i4bqzmwagq0ilz2s37jajvzf1xwx3hmmbd1k3ss7mjm72r"; + vendorSha256 = "0c3ly0s438sr9iql2ps4biaswphp7dfxshddyw5fcm0ajqzvhrmw"; subPackages = [ "cmd/loop" "cmd/loopd" ]; From 0041c35bb42564439b0c55af8937ac48cbf7af8d Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Thu, 12 Aug 2021 09:38:19 +0000 Subject: [PATCH 091/234] btcpayserver: 1.1.2 -> 1.2.0 --- .../blockchains/btcpayserver/default.nix | 4 +- .../blockchains/btcpayserver/deps.nix | 76 ++++++++----------- .../blockchains/nbxplorer/default.nix | 4 +- .../blockchains/nbxplorer/deps.nix | 16 ++-- 4 files changed, 45 insertions(+), 55 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index ba029aedeeb..8d549c96c34 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-A9XIKCw1dL4vUQYSu6WdmpR82dAbtKVTyjllquyRGgs="; + sha256 = "sha256-pRc0oud8k6ulC6tVXv6Mr7IEC2a/+FhkMDyxz1zFKTE="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 8884dc2fe14..38ce6130229 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -26,53 +26,48 @@ }) (fetchNuGet { name = "BTCPayServer.Hwi"; - version = "1.1.3"; - sha256 = "1c8hfnrjh2ad8qh75d63gsl170q8czf3j1hk8sv8fnbgnxdnkm7a"; + version = "2.0.1"; + sha256 = "18pp3f0z10c0q1bbllxi2j6ix8f0x58d0dndi5faf9p3hb58ly9k"; }) (fetchNuGet { name = "BTCPayServer.Lightning.All"; - version = "1.2.7"; - sha256 = "0jzmzvlpf6iba2fsc6cyi69vlaim9slqm2sapknmd7drl3gcn2zj"; + version = "1.2.10"; + sha256 = "0c3bi5r7sckzml44bqy0j1cd6l3xc29cdyf6rib52b5gmgrvcam2"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Charge"; - version = "1.2.3"; - sha256 = "1rdrwmijx0v4z0xsq4acyvdcj7hv6arfh3hwjy89rqnkkznrzgwv"; + version = "1.2.5"; + sha256 = "02mf7yhr9lfy5368c5mn1wgxxka52f0s5vx31w97sdkpc5pivng5"; }) (fetchNuGet { name = "BTCPayServer.Lightning.CLightning"; - version = "1.2.3"; - sha256 = "02197rh03q8d0mv40zf67wp1rd2gbxi5l8krd2rzj84n267bcfvc"; + version = "1.2.6"; + sha256 = "1p4bzbrd2d0izjd9q06mnagl31q50hpz5jla9gfja1bhn3xqvwsy"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Common"; - version = "1.2.0"; - sha256 = "17di8ndkw8z0ci0zk15mcrqpmganwkz9ys2snr2rqpw5mrlhpwa0"; - }) - (fetchNuGet { - name = "BTCPayServer.Lightning.Common"; - version = "1.2.2"; - sha256 = "07xb7fsqvfjmcawxylriw60i73h0cvfb765aznhp9ffyrmjaql7z"; + version = "1.2.4"; + sha256 = "1bdj1cdf6sirwm19hq1k2fmh2jiqkcyzrqms6q9d0wqba9xggwyn"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Eclair"; - version = "1.2.2"; - sha256 = "03dymhwxb5s28kb187g5h4aysnz2xzml89p47nmwz9lkg2h4s73h"; + version = "1.2.4"; + sha256 = "1l68sc9g4ffsi1bbgrbbx8zmqw811hjq17761q1han9gsykl5rr1"; }) (fetchNuGet { name = "BTCPayServer.Lightning.LND"; - version = "1.2.4"; - sha256 = "0qnj5rsp6hnybsr58zny9dfbsxksg1674q0z9944jwkzm7pcqyg4"; + version = "1.2.6"; + sha256 = "16wipkzzfrcjhi3whqxdfjq7qxnwjzf4gckpf1qjgdxbzggh6l3d"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Ptarmigan"; - version = "1.2.2"; - sha256 = "17yl85vqfp7l12bv3f3w1b861hm41i7cfhs78gaq04s4drvcnj6k"; + version = "1.2.4"; + sha256 = "1j80m4pb3nn4dnqmxda13lp87pgviwxai456pki097rmc0vmqj83"; }) (fetchNuGet { name = "BuildBundlerMinifier"; - version = "3.2.435"; - sha256 = "0y1p226dbvs7q2ngm9w4mpkhfrhw2y122plv1yff7lx5m84ia02l"; + version = "3.2.449"; + sha256 = "1dcjlfl5w2vfppx2hq3jj6xy24id2x3hcajwylhphlz9jw2bnhsv"; }) (fetchNuGet { name = "BundlerMinifier.Core"; @@ -761,18 +756,8 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.31"; - sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.33"; - sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.4"; - sha256 = "04iafda61izzxb691brk72qs01m5dadqb4970nw5ayck6275s71i"; + version = "3.0.3"; + sha256 = "0129mgnyyb55haz68d8z694g1q2rlc0qylx08d5qnfpq1r03cdqd"; }) (fetchNuGet { name = "NBitcoin"; @@ -786,13 +771,18 @@ }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.73"; - sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1"; + version = "5.0.81"; + sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.77"; - sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb"; + version = "6.0.3"; + sha256 = "1kfq1q86844ssp8myy5vmvg33h3x0p9gqrlc99fl9gm1vzjc723f"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "6.0.7"; + sha256 = "0mk8n8isrrww0240x63rx3zx12nz5v08i3w62qp1n18mmdw3rdy6"; }) (fetchNuGet { name = "NBitpayClient"; @@ -801,8 +791,8 @@ }) (fetchNuGet { name = "NBXplorer.Client"; - version = "3.0.21"; - sha256 = "1asri2wsjq3ljf2p4r4x52ba9cirh8ccc5ysxpnv4cvladkdazbi"; + version = "4.0.3"; + sha256 = "0x9iggc5cyv06gnwnwrk3riv2j3g0833imdf3jx8ghmrxvim88b3"; }) (fetchNuGet { name = "Nethereum.ABI"; @@ -1116,8 +1106,8 @@ }) (fetchNuGet { name = "Selenium.WebDriver.ChromeDriver"; - version = "88.0.4324.9600"; - sha256 = "0jm8dpfp329xsrg69lzq2m6x9yin1m43qgrhs15cz2qx9f02pdx9"; + version = "90.0.4430.2400"; + sha256 = "18gjm92nzzvxf0hk7c0nnabs0vmh6yyzq3m4si7p21m6xa3bqiga"; }) (fetchNuGet { name = "Selenium.WebDriver"; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 40deef62c2c..65d845988f9 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.52"; + version = "2.1.58"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-+BP71TQ8BTGZ/SbS7CrI4D7hcQaVLt+hCpInbOdU5GY="; + sha256 = "sha256-rhD0owLEx7WxZnGPNaq4QpZopMsFQDOTnA0fs539Wxg="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index b7b01b14bff..f5ab743e138 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -181,23 +181,23 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.33"; - sha256 = "12r4w89247xzrl2g01iv13kg1wl7gzfz1zikimx6dyhr4iipbmgf"; + version = "3.0.3"; + sha256 = "0129mgnyyb55haz68d8z694g1q2rlc0qylx08d5qnfpq1r03cdqd"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "2.0.23"; - sha256 = "03jw3gay7brm7s7jwn4zbk1n1sq7gck523cx3ckx87v3wi2062lx"; + version = "3.0.3"; + sha256 = "1j3ajj4jrwqzlhzhkg7vicwab0aq2y50x53rindd8cq09jxvzk62"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.78"; - sha256 = "1mfn045l489bm2xgjhvddhfy4xxcy42q6jhq4nyd6fnxg4scxyg9"; + version = "6.0.6"; + sha256 = "1kf2rjrnh97zlh00affsv95f94bwgr2h7b00njqac4qgv9cac7sa"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.81"; - sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x"; + version = "6.0.8"; + sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) (fetchNuGet { name = "NETStandard.Library"; From 7c9a8113b2acd9b7c6aee07dd7f7a5bdfa2c4afe Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 12 Aug 2021 12:57:35 +0200 Subject: [PATCH 092/234] hydrus: 448 -> 450 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index d46569028c2..1cf1531ef35 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "448"; + version = "450"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-h7FQRgxqXDEXDFRQEPeJUIbJYf9fs68oUQv5rCUS0zw="; + sha256 = "sha256-sMy5Yv7PGK3U/XnB8IrutSqSBiq1cfD6pAO5BxbWG5A="; }; nativeBuildInputs = [ From 8b085dac8f86c6295e593ed1172952724f8ea7c7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Aug 2021 11:29:53 +0000 Subject: [PATCH 093/234] fennel: 0.9.2 -> 0.10.0 --- pkgs/development/compilers/fennel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fennel/default.nix b/pkgs/development/compilers/fennel/default.nix index 6165a522c3a..bae976a9b68 100644 --- a/pkgs/development/compilers/fennel/default.nix +++ b/pkgs/development/compilers/fennel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fennel"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromSourcehut { owner = "~technomancy"; repo = pname; rev = version; - sha256 = "1kpm3lzxzwkhxm4ghpbx8iw0ni7gb73y68lsc3ll2rcx0fwv9303"; + sha256 = "sha256-/xCnaDNZJTBGxIgjPUVeEyMVeRWg8RCNuo5nPpLrJXY="; }; nativeBuildInputs = [ installShellFiles ]; From dd3049da636e14588b9aca4a2c2536a4e642e699 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 11 Aug 2021 19:00:00 -0500 Subject: [PATCH 094/234] ocamlPackages.ocp-index: 1.2.2 -> 1.3.1 --- pkgs/development/tools/ocaml/ocp-index/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index c14cd7ddc04..716e2679a94 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,14 +1,16 @@ -{ lib, fetchzip, buildDunePackage, cppo, ocp-indent, cmdliner, re }: +{ lib, fetchFromGitHub, buildDunePackage, cppo, ocp-indent, cmdliner, re }: buildDunePackage rec { pname = "ocp-index"; - version = "1.2.2"; + version = "1.3.1"; useDune2 = true; - src = fetchzip { - url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz"; - sha256 = "0k4i0aabyn750f4wqbnk0yv10kdjd6nhjw2pbmpc4cz639qcsm40"; + src = fetchFromGitHub { + owner = "OCamlPro"; + repo = "ocp-index"; + rev = version; + sha256 = "120w72fqymjp6ibicbp31jyx9yv34mdvgkr0zdfpzvfb7lgd8rc7"; }; buildInputs = [ cppo cmdliner re ]; @@ -18,6 +20,7 @@ buildDunePackage rec { meta = { homepage = "https://www.typerex.org/ocp-index.html"; description = "A simple and light-weight documentation extractor for OCaml"; + changelog = "https://github.com/OCamlPro/ocp-index/raw/${version}/CHANGES.md"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ vbgl ]; }; From 72cfa909f4b5960de92388be66aaee5467355575 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Thu, 12 Aug 2021 22:15:03 +1000 Subject: [PATCH 095/234] allegro5: fix native dialog addon --- pkgs/development/libraries/allegro/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 5cd6584f18f..380cc1f7198 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -3,7 +3,7 @@ , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL, libjpeg, flac , libXi, libXfixes, freetype, libopus, libtheora -, physfs, enet, pkg-config, gtk2, pcre, libpulseaudio, libpthreadstubs +, physfs, enet, pkg-config, gtk3, pcre, libpulseaudio, libpthreadstubs , libXdmcp }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes - enet libtheora freetype physfs libopus pkg-config gtk2 pcre libXdmcp + enet libtheora freetype physfs libopus pkg-config gtk3 pcre libXdmcp libpulseaudio libpthreadstubs ]; From 781ab443c2170a80621920ea40bfc773553630fc Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 12 Aug 2021 14:25:43 +0200 Subject: [PATCH 096/234] nixos/doas: fix recursive calls to doas Previously, for processes launched by doas the unwrapped doas binary preceded the setuid-wrapped doas binary in PATH. This caused error `doas: not installed setuid` when running doas from processes launched by doas. doas seems to short-circuit the PATH lookup when called like `doas -u myuser doas -u myuser ...` so the error doesn't appear in this case. --- nixos/tests/doas.nix | 7 +++++++ .../doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/tests/doas.nix b/nixos/tests/doas.nix index 9c0a4bdc756..5e9ce4b2c79 100644 --- a/nixos/tests/doas.nix +++ b/nixos/tests/doas.nix @@ -78,6 +78,13 @@ import ./make-test-python.nix ( 'su - test7 -c "SSH_AUTH_SOCK=HOLEY doas env"' ): raise Exception("failed to exclude SSH_AUTH_SOCK") + + # Test that the doas setuid wrapper precedes the unwrapped version in PATH after + # calling doas. + # The PATH set by doas is defined in + # ../../pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch + with subtest("recursive calls to doas from subprocesses should succeed"): + machine.succeed('doas -u test0 sh -c "doas -u test0 true"') ''; } ) diff --git a/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch b/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch index d1a1997ba1f..a22781269d8 100644 --- a/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch +++ b/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch @@ -15,7 +15,7 @@ index e253905..2fdb20f 100644 main(int argc, char **argv) { const char *safepath = "/bin:/sbin:/usr/bin:/usr/sbin:" -+ "/run/current-system/sw/bin:/run/current-system/sw/sbin:/run/wrappers/bin:" ++ "/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/sbin:" "/usr/local/bin:/usr/local/sbin"; const char *confpath = NULL; char *shargv[] = { NULL, NULL }; From 3c471e76e881261f4610a57b10d929fe7ae3def9 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 12 Aug 2021 15:31:28 +0200 Subject: [PATCH 097/234] tkrzw: 0.9.3 -> 0.9.51 --- pkgs/development/libraries/tkrzw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix index 17375125bd2..e8163c5282c 100644 --- a/pkgs/development/libraries/tkrzw/default.nix +++ b/pkgs/development/libraries/tkrzw/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tkrzw"; - version = "0.9.3"; + version = "0.9.51"; # TODO: defeat multi-output reference cycles src = fetchurl { url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; - sha256 = "1ap93fsw7vhn329kvy8g20l8p4jdygfl8r8mrgsfcpa20a29fnwl"; + hash = "sha256-UqF2cJ/r8OksAKyHw6B9UiBFIXgKeDmD2ZyJ+iPkY2w="; }; enableParallelBuilding = true; From e8f9c0583f3b49703a23842310d353b8c7529224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 12 Aug 2021 10:38:19 -0300 Subject: [PATCH 098/234] luna-icons: 1.2 -> 1.3 --- pkgs/data/icons/luna-icons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index 0a0cba1e98e..3b5bc262c03 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0kjnmclil21m9vgybk958nzzlbwryp286rajlgxg05wgjnby4cxk"; + sha256 = "0pww8882qvlnamxzvn7jxyi0h7lffrwld7qqs1q08h73xc3p18nv"; }; nativeBuildInputs = [ From b85fb6cdba8b382aa989313bda00a6f35129182d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 12 Aug 2021 22:30:41 +0800 Subject: [PATCH 099/234] appeditor: 1.1.0 -> 1.1.1 --- pkgs/applications/misc/appeditor/default.nix | 14 +++++------- .../misc/appeditor/fix-build-vala-0.46.patch | 22 ------------------- 2 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index d0db2b12dfd..a715681ae9f 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -11,17 +11,18 @@ , glib , gtk3 , libgee -, wrapGAppsHook }: +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "appeditor"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "donadigo"; repo = "appeditor"; rev = version; - sha256 = "04x2f4x4dp5ca2y3qllqjgirbyl6383pfl4bi9bkcqlg8b5081rg"; + sha256 = "14ycw1b6v2sa4vljpnx2lpx4w89mparsxk6s8w3yx4dqjglcg5bp"; }; nativeBuildInputs = [ @@ -41,11 +42,6 @@ stdenv.mkDerivation rec { libgee ]; - patches = [ - # See: https://github.com/donadigo/appeditor/issues/88 - ./fix-build-vala-0.46.patch - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py @@ -62,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/donadigo/appeditor"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch b/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch deleted file mode 100644 index f6c0b4cfd28..00000000000 --- a/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/DesktopApp.vala b/src/DesktopApp.vala -index 0e6fa47..ebcde0c 100644 ---- a/src/DesktopApp.vala -+++ b/src/DesktopApp.vala -@@ -130,7 +130,7 @@ public class AppEditor.DesktopApp : Object { - - public unowned string get_path () { - if (path == null) { -- unowned string _path = info.get_string (KeyFileDesktop.KEY_PATH); -+ string _path = info.get_string (KeyFileDesktop.KEY_PATH); - if (_path == null) { - _path = ""; - } -@@ -150,7 +150,7 @@ public class AppEditor.DesktopApp : Object { - } - - public bool get_should_show () { -- return info.should_show () && !get_terminal (); -+ return info.should_show () && !get_terminal (); - } - - public string[] get_categories () { From 20ed07939ee194195f1b5ded634ae0bc7252dbf4 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 12 Aug 2021 15:00:56 +0000 Subject: [PATCH 100/234] linux: 4.4.279 -> 4.4.280 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index da435b307e5..78192baa816 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.279"; + version = "4.4.280"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1d3cfhs7ixk0dhh1mc1z6y73i816a2wl16zhayl1ssp69d4ndpsb"; + sha256 = "1b9jx9zkycj0xjmy35890q5phiznayaz730dmsv3mdjg4qgfn18y"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From ff1408d8b0d0baadb5e61f93904b820d0232bbbb Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 12 Aug 2021 15:01:11 +0000 Subject: [PATCH 101/234] linux: 5.13.9 -> 5.13.10 --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index 4086299c0c3..73625913354 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.9"; + version = "5.13.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "16hm6sb64f1hlr0qmf2w81zv55s6flj1x8jr2q326d9ny30przkj"; + sha256 = "01fpj02q4vdn7i6f6710lly0w33cd5gfvn6avgrjglcbiwdzbjih"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From 89a50ded986523e04028e8ebc1b12274c52ea96d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 12 Aug 2021 15:01:53 +0000 Subject: [PATCH 102/234] linux-rt_5_4: 5.4.129-rt61 -> 5.4.138-rt62 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 4c49dc9c42a..7413728cbf6 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.129-rt61"; # updated by ./update-rt.sh + version = "5.4.138-rt62"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4"; + sha256 = "0mw6k9zrcmv1j4b3han5c0q8xbh38bka2wkkbl1y3ralg9r5ffd4"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0b3hp6a7afkjqd7an4hj423nq6flwzd42kjcyk4pifv5fx6c7pgq"; + sha256 = "1zw7806fxx9cai9n6siv534x5r52d8fc13r07ypgw461pijcy5p6"; }; }; in [ rt-patch ] ++ kernelPatches; From 4a370f1fc45c9de48059c0f5c6597b50c24eab65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Aug 2021 15:24:22 +0000 Subject: [PATCH 103/234] recursive: 1.078 -> 1.079 --- pkgs/data/fonts/recursive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 320e0cd7266..caff63da8c7 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.078"; + version = "1.079"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "0vmdcqz6rlshfk653xpanyxps96p85b1spqahl3yiy29mq4xfdn3"; + sha256 = "sha256-nRFjfbbZG9wDHGbGfS+wzViKF/ogWs8i/6OG0rkDHDg="; meta = with lib; { homepage = "https://recursive.design/"; From 4c3354e17efdd0d66c09cdeca1b9cd0b6bcb295e Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 12 Aug 2021 10:00:11 -0600 Subject: [PATCH 104/234] upwork: 5.5.0.11 -> 5.6.7.13 --- pkgs/applications/misc/upwork/default.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 976aae78171..e70b875e6f2 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook , alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype -, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid -, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb -, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: +, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb +, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender +, libXScrnSaver, libXtst, mesa, nspr, nss, pango, systemd }: stdenv.mkDerivation rec { pname = "upwork"; - version = "5.5.0.11"; + version = "5.6.7.13"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_11_61df9c99b6df4e7b/${pname}_${version}_amd64.deb"; - sha256 = "db83d5fb1b5383992c6156284f6f3cd3a6b23f727ce324ba90c82817553fb4f7"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_7_13_9f0e0a44a59e4331/${pname}_${version}_amd64.deb"; + sha256 = "f1d3168cda47f77100192ee97aa629e2452fe62fb364dd59ad361adbc0d1da87"; }; dontWrapGApps = true; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { buildInputs = [ libcxx systemd libpulseaudio - stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype - gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid - libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss libxcb pango systemd libXScrnSaver + stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups + dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libdrm libnotify + libuuid libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes + libXi libXrandr libXrender libXScrnSaver libXtst mesa nspr nss pango systemd ]; libPath = lib.makeLibraryPath buildInputs; @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { mv usr $out mv opt $out sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop - makeWrapper $out/opt/Upwork/upwork \ $out/bin/upwork \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ From ae998d5d24236ebb984008b404b82c56945627d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Aug 2021 16:06:54 +0000 Subject: [PATCH 105/234] flyway: 7.12.1 -> 7.13.0 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 3db9e0f3867..4674ae5170a 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "7.12.1"; + version = "7.13.0"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-EwS4prlZlI6V0mUidE7Kaz/rYy5ji/DB0huDt0ATxGs="; + sha256 = "sha256-rZUVxswJdCFKwuXlzko+t+ZO1plRgH2VcZFJ5kkiM2s="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 6525bbc06a39f26750ad8ee0d40000ddfdc24acb Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 12 Aug 2021 18:21:20 +0200 Subject: [PATCH 106/234] unetbootin: use libsForQt5.callPackage (#133520) --- pkgs/tools/cd-dvd/unetbootin/default.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index f80f6060847..88fab512b0b 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -2,10 +2,12 @@ , stdenv , coreutils , fetchFromGitHub -, libsForQt5 , mtools , p7zip -, qt5 +, wrapQtAppsHook +, qtbase +, qttools +, qmake , syslinux , util-linux , which @@ -27,14 +29,12 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - qt5.qtbase - qt5.qttools - libsForQt5.qmake + qtbase + qttools + qmake ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ wrapQtAppsHook ]; # Lots of nice hard-coded paths... postPatch = '' @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool to create bootable live USB drives from ISO images"; - homepage = "http://unetbootin.github.io/"; + homepage = "https://unetbootin.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ebzzry ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85a4be3fbeb..2296fea133f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9678,7 +9678,7 @@ with pkgs; umlet = callPackage ../tools/misc/umlet { }; - unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; + unetbootin = libsForQt5.callPackage ../tools/cd-dvd/unetbootin { }; unfs3 = callPackage ../servers/unfs3 { }; From 157ab47a640ae90b2c040313c3329f79120b9224 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Aug 2021 16:27:39 +0000 Subject: [PATCH 107/234] icingaweb2: 2.9.2 -> 2.9.3 --- pkgs/servers/icingaweb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index bde0cb01005..cf900ffd7fd 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "sha256-sCglJDxEUOAcBwNowLjglMi6y92QJ4ZF+I/5HPfTE+s="; + sha256 = "sha256-nPzf/SGyjEXuy0Q/Lofe1rSbW+4E6LXKzyi4np3jvF4="; }; nativeBuildInputs = [ makeWrapper ]; From f20016a4ab58d102f7f6b90a60a7ae8a899a1f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 12 Aug 2021 18:50:22 +0200 Subject: [PATCH 108/234] wezterm: install shell-integration script --- pkgs/applications/terminal-emulators/wezterm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index e3e10f6e0f9..23dbeb3b63f 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -87,13 +87,18 @@ rustPlatform.buildRustPackage rec { buildInputs = runtimeDeps; postInstall = '' + # terminfo mkdir -p $terminfo/share/terminfo/w $out/nix-support tic -x -o $terminfo/share/terminfo termwiz/data/wezterm.terminfo echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + # desktop icon install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png install -Dm644 assets/wezterm.desktop $out/share/applications/org.wezfurlong.wezterm.desktop install -Dm644 assets/wezterm.appdata.xml $out/share/metainfo/org.wezfurlong.wezterm.appdata.xml + + # helper scripts + install -Dm644 assets/shell-integration/wezterm.sh $out/share/wezterm/shell-integration/wezterm.sh ''; preFixup = lib.optionalString stdenv.isLinux '' From 4bf7a9f124cf47554ea43cc60c1a6cd03d92091b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:22:37 +0200 Subject: [PATCH 109/234] varnish6(2|3): drop --- pkgs/servers/varnish/default.nix | 8 -------- pkgs/servers/varnish/packages.nix | 8 +------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 6 ++---- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 1fbb36257d2..6ee30a701db 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -44,12 +44,4 @@ in version = "6.0.7"; sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a"; }; - varnish62 = common { - version = "6.2.3"; - sha256 = "02b6pqh5j1d4n362n42q42bfjzjrngd6x49b13q7wzsy6igd1jsy"; - }; - varnish63 = common { - version = "6.3.2"; - sha256 = "1f5ahzdh3am6fij5jhiybv3knwl11rhc5r3ig1ybzw55ai7788q8"; - }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index a5c5fe868d0..622bd8177b6 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackage, varnish60, varnish62, varnish63 }: +{ callPackage, varnish60 }: { varnish60Packages = { @@ -6,10 +6,4 @@ digest = callPackage ./digest.nix { varnish = varnish60; }; dynamic = callPackage ./dynamic.nix { varnish = varnish60; }; }; - varnish62Packages = { - varnish = varnish62; - }; - varnish63Packages = { - varnish = varnish63; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 87c58298746..1cfda235b6c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -894,6 +894,8 @@ mapAliases ({ v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38"; vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 + varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 + varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05 vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 vimbWrapper = vimb; # added 2015-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85a4be3fbeb..94a1e6f20f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10148,11 +10148,9 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish62 varnish63; + varnish60; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages - varnish62Packages - varnish63Packages; + varnish60Packages; varnishPackages = varnish63Packages; varnish = varnishPackages.varnish; From 49df287d208b1b6f222e54fdca389613afbe2fa0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:23:40 +0200 Subject: [PATCH 110/234] varnish65: init at 6.5.2 --- pkgs/servers/varnish/default.nix | 4 ++++ pkgs/servers/varnish/packages.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 6ee30a701db..68ec4e99ead 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -44,4 +44,8 @@ in version = "6.0.7"; sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a"; }; + varnish65 = common { + version = "6.5.2"; + sha256 = "041gc22h8cwsb8jw7zdv6yk5h8xg2q0g655m5zhi5jxq35f2sljx"; + }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 622bd8177b6..1932561be8a 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackage, varnish60 }: +{ callPackage, varnish60, varnish65 }: { varnish60Packages = { @@ -6,4 +6,7 @@ digest = callPackage ./digest.nix { varnish = varnish60; }; dynamic = callPackage ./dynamic.nix { varnish = varnish60; }; }; + varnish65Packages = { + varnish = varnish65; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94a1e6f20f8..78d999341b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10148,9 +10148,9 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60; + varnish60 varnish65; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages; + varnish60Packages varnish65Packages; varnishPackages = varnish63Packages; varnish = varnishPackages.varnish; From 9c765d4534e8b4a58c61f8fd0175c295a2bb86e4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:33:27 +0200 Subject: [PATCH 111/234] varnishPackages.*: fix and update dynamic module --- pkgs/servers/varnish/dynamic.nix | 8 ++++---- pkgs/servers/varnish/packages.nix | 15 +++++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 637380a5abd..78fd4d10641 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils, version, sha256 }: -stdenv.mkDerivation rec { - version = "0.4"; +stdenv.mkDerivation { pname = "${varnish.name}-dynamic"; + inherit version; src = fetchFromGitHub { owner = "nigoroll"; repo = "libvmod-dynamic"; rev = "v${version}"; - sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; + inherit sha256; }; nativeBuildInputs = [ pkg-config docutils autoreconfHook269 varnish.python ]; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 1932561be8a..9876f131ff0 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,12 +1,19 @@ -{ callPackage, varnish60, varnish65 }: - -{ +{ callPackage, varnish60, varnish65, fetchFromGitHub }: { varnish60Packages = { varnish = varnish60; digest = callPackage ./digest.nix { varnish = varnish60; }; - dynamic = callPackage ./dynamic.nix { varnish = varnish60; }; + dynamic = callPackage ./dynamic.nix { + varnish = varnish60; + version = "0.4"; + sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; + }; }; varnish65Packages = { varnish = varnish65; + dynamic = callPackage ./dynamic.nix { + varnish = varnish65; + version = "2.3.1"; + sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88"; + }; }; } From 881f8b97eb6c2d68be2ffb26631eac2091a6570a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:45:00 +0200 Subject: [PATCH 112/234] varnish: fix varnishtest --- pkgs/servers/varnish/default.nix | 6 +++++- pkgs/servers/varnish/digest.nix | 8 ++++---- pkgs/servers/varnish/packages.nix | 11 ++++++++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 68ec4e99ead..1d4a3276cc0 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit +{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils , python3, makeWrapper }: let @@ -21,6 +21,10 @@ let buildFlags = [ "localstatedir=/var/spool" ]; + postPatch = '' + substituteInPlace bin/varnishtest/vtc_main.c --replace /bin/rm "${coreutils}/bin/rm" + ''; + postInstall = '' wrapProgram "$out/sbin/varnishd" --prefix PATH : "${lib.makeBinPath [ stdenv.cc ]}" ''; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 4511eb3a724..3f5c6aa4381 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils, version, sha256 }: stdenv.mkDerivation rec { - version = "1.0.2"; pname = "${varnish.name}-digest"; + inherit version; src = fetchFromGitHub { owner = "varnish"; repo = "libvmod-digest"; - rev = "libvmod-digest-${version}"; - sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx"; + rev = version; + inherit sha256; }; nativeBuildInputs = [ autoreconfHook pkg-config docutils ]; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 9876f131ff0..c8afc50e498 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,7 +1,11 @@ { callPackage, varnish60, varnish65, fetchFromGitHub }: { varnish60Packages = { varnish = varnish60; - digest = callPackage ./digest.nix { varnish = varnish60; }; + digest = callPackage ./digest.nix { + varnish = varnish60; + version = "libvmod-digest-1.0.2"; + sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx"; + }; dynamic = callPackage ./dynamic.nix { varnish = varnish60; version = "0.4"; @@ -10,6 +14,11 @@ }; varnish65Packages = { varnish = varnish65; + digest = callPackage ./digest.nix { + varnish = varnish65; + version = "6.6"; + sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn"; + }; dynamic = callPackage ./dynamic.nix { varnish = varnish65; version = "2.3.1"; From d0d171cadc3350a262042767ab06ddd6e7f7c649 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:45:14 +0200 Subject: [PATCH 113/234] varnishPackages.*: fix and update digest module --- pkgs/servers/varnish/digest.nix | 2 +- pkgs/servers/varnish/packages.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 3f5c6aa4381..31aaad835bd 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils, version, sha256 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils, coreutils, version, sha256 }: stdenv.mkDerivation rec { pname = "${varnish.name}-digest"; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index c8afc50e498..647247acafd 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,26 +1,26 @@ { callPackage, varnish60, varnish65, fetchFromGitHub }: { - varnish60Packages = { + varnish60Packages = rec { varnish = varnish60; digest = callPackage ./digest.nix { - varnish = varnish60; + inherit varnish; version = "libvmod-digest-1.0.2"; sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx"; }; dynamic = callPackage ./dynamic.nix { - varnish = varnish60; + inherit varnish; version = "0.4"; sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish65Packages = { + varnish65Packages = rec { varnish = varnish65; digest = callPackage ./digest.nix { - varnish = varnish65; + inherit varnish; version = "6.6"; sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn"; }; dynamic = callPackage ./dynamic.nix { - varnish = varnish65; + inherit varnish; version = "2.3.1"; sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88"; }; From 586ca51a784ad223524ca2dfb71738430feb2c1c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:48:23 +0200 Subject: [PATCH 114/234] varnishPackages: update default, because we dropped 6.3.x --- .../manual/from_md/release-notes/rl-2111.section.xml | 12 ++++++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 3 +++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 68d09a77813..8504593e768 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -668,6 +668,11 @@ to use wildcards in the source argument. + + + <<<<<<< HEAD + + The openrazer and @@ -703,6 +708,13 @@ web UI this port needs to be opened in the firewall. + + + The varnish package was upgraded from 6.3.x + to 6.5.x. varnish60 for the last LTS + release is also still available. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index d7c38056ef6..024ed9c7399 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -171,6 +171,7 @@ pt-services.clipcat.enable). - `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument. +<<<<<<< HEAD - The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group. - The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. @@ -179,6 +180,8 @@ pt-services.clipcat.enable). configures the address and port the web UI is listening, it defaults to `:9001`. To be able to access the web UI this port needs to be opened in the firewall. +- The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78d999341b8..a5ac430f3cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10152,7 +10152,7 @@ with pkgs; inherit (callPackages ../servers/varnish/packages.nix { }) varnish60Packages varnish65Packages; - varnishPackages = varnish63Packages; + varnishPackages = varnish65Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { }; From c23478fb17d27a4fe8100389b5ad0415003b6f0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Aug 2021 17:10:20 +0000 Subject: [PATCH 115/234] jackett: 0.18.531 -> 0.18.537 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index a5b241b2078..f76e90ebad2 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.531"; + version = "0.18.537"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-ZykgYzE86bt5SNeHng995TQuE15ajWhThgqt2fJFizc="; + sha256 = "sha256-BJIyw2xjJK6lQbpVrH9pL5EasN6tvTdOsQyxYq7C9O8="; }; nativeBuildInputs = [ makeWrapper ]; From b2af47ffd6eb25745aef355450541b9dd2478240 Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Thu, 12 Aug 2021 19:25:51 +0200 Subject: [PATCH 116/234] plex: 1.23.6.4881-e2e58f321 -> 1.24.0.4930-ab6e1a058 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 1d404f1fa19..40c2d3310f3 100644 --- a/pkgs/servers/plex/raw.nix +++ b/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.23.6.4881-e2e58f321"; + version = "1.24.0.4930-ab6e1a058"; 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 = "02vmisqcrchr48pdx61ysfd9j95i5vyr30k20inx3xk4rj50a3cl"; + sha256 = "0fhbm2ykk2nx1j619kpzgw32rgbh2snh8g25m7k42cpmg4a3zz4m"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1wf48h8aqzg5wszp2rcx9mv8xv6xsnqh405z3jna65mxhycf4cv9"; + sha256 = "0h1vk8ads1jrb5adcpfrz1qdf60jw4wiss9zzcyamfry1ir94n3r"; }; outputs = [ "out" "basedb" ]; From f46d15905d79892f1189964f613f4129b43e18ba Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 Aug 2021 01:00:42 +0300 Subject: [PATCH 117/234] blackbox: 1.20181219 -> 2.0.0 and enable tests --- .../version-management/blackbox/default.nix | 58 +++++++++++++++---- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index aee0e92e806..5c802d8a300 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -1,24 +1,62 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, expect +, which +, gnupg +, coreutils +, git +, pinentry +, gnutar +, procps +}: stdenv.mkDerivation rec { - version = "1.20181219"; - pname = "blackbox"; + pname = "blackbox"; + version = "2.0.0"; src = fetchFromGitHub { - owner = "stackexchange"; - repo = pname; - rev = "v${version}"; - sha256 = "1lpwwwc3rf992vdf3iy1ds07n1xkmad065im2bqzc6kdsbkn7rjx"; + owner = "stackexchange"; + repo = pname; + rev = "v${version}"; + sha256 = "1plwdmzds6dq2rlp84dgiashrfg0kg4yijhnxaapz2q4d1vvx8lq"; }; + buildInputs = [ gnupg ]; + + doCheck = true; + + checkInputs = [ + expect + which + coreutils + pinentry.tty + git + gnutar + procps + ]; + + postPatch = '' + patchShebangs bin tools + substituteInPlace Makefile \ + --replace "PREFIX?=/usr/local" "PREFIX=$out" + + substituteInPlace tools/confidence_test.sh \ + --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:''${blackbox_home}"' \ + "PATH=/build/source/bin/:$PATH" + ''; + installPhase = '' - mkdir -p $out/bin && cp -r bin/* $out/bin + runHook preInstall + mkdir -p $out/bin + make copy-install + runHook postInstall ''; meta = with lib; { description = "Safely store secrets in a VCS repo"; maintainers = with maintainers; [ ericsagnes ]; - license = licenses.mit; - platforms = platforms.all; + license = licenses.mit; + platforms = platforms.all; }; } From 9b4e383bc7d4af42215610073ab6e5afaa45653a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Aug 2021 20:22:56 +0200 Subject: [PATCH 118/234] python3Packages.asyncpg: 0.23.0 -> 0.24.0 --- pkgs/development/python-modules/asyncpg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 5525f7940c2..9c9e2d623dc 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.23.0"; + version = "0.24.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "812dafa4c9e264d430adcc0f5899f0dc5413155a605088af696f952d72d36b5e"; + sha256 = "sha256-3S+gY8M0SCNIfZ3cy0CALwJiLd+L+KbMU4he56LBwMY="; }; checkInputs = [ From e70dd8569d17dd80ed618d3aea4cb353ef1dc1b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Aug 2021 20:28:57 +0200 Subject: [PATCH 119/234] python3Packages.bimmer-connected: 0.7.15 -> 0.7.18 --- pkgs/development/python-modules/bimmer-connected/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index c7abe9cfd99..3f69907feb6 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.7.15"; + version = "0.7.18"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - sha256 = "193m16rrq7mfvzjcq823icdr9fp3i8grqqn3ci8zhcsq6w3vnb90"; + sha256 = "sha256-90Rli0tiZIO2gtx3EfPXg8U6CSKEmHUiRePjITvov/E="; }; nativeBuildInputs = [ From 63c0bce35987124d646bcf0896864e63e01b75d1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 20:41:54 +0200 Subject: [PATCH 120/234] tools/graphics: replace name with pname&version --- pkgs/tools/graphics/dcraw/default.nix | 5 +++-- pkgs/tools/graphics/editres/default.nix | 5 +++-- pkgs/tools/graphics/escrotum/default.nix | 3 ++- pkgs/tools/graphics/exiftags/default.nix | 7 ++++--- pkgs/tools/graphics/fgallery/default.nix | 5 +++-- pkgs/tools/graphics/icoutils/default.nix | 5 +++-- pkgs/tools/graphics/jbig2enc/default.nix | 7 ++++--- pkgs/tools/graphics/leela/default.nix | 3 ++- pkgs/tools/graphics/netpbm/default.nix | 3 ++- pkgs/tools/graphics/optipng/default.nix | 5 +++-- pkgs/tools/graphics/plotutils/default.nix | 5 +++-- pkgs/tools/graphics/pngcheck/default.nix | 5 +++-- pkgs/tools/graphics/pngcrush/default.nix | 5 +++-- pkgs/tools/graphics/pngnq/default.nix | 5 +++-- pkgs/tools/graphics/pngout/default.nix | 7 ++++--- pkgs/tools/graphics/pngtoico/default.nix | 7 ++++--- pkgs/tools/graphics/pstoedit/default.nix | 5 +++-- pkgs/tools/graphics/transfig/default.nix | 8 +++++--- pkgs/tools/graphics/xcftools/default.nix | 7 ++++--- 19 files changed, 61 insertions(+), 41 deletions(-) diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 488fdb2b267..35657cf8fc5 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }: stdenv.mkDerivation rec { - name = "dcraw-9.28.0"; + pname = "dcraw"; + version = "9.28.0"; src = fetchurl { - url = "https://www.dechifro.org/dcraw/archive/${name}.tar.gz"; + url = "https://www.dechifro.org/dcraw/archive/dcraw-${version}.tar.gz"; sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 3a55524dc00..c9c1544c9a0 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libXt, libXaw, libXres, utilmacros }: stdenv.mkDerivation rec { - name = "editres-1.0.7"; + pname = "editres"; + version = "1.0.7"; src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.gz"; + url = "mirror://xorg/individual/app/editres-${version}.tar.gz"; sha256 = "10mbgijb6ac6wqb2grpy9mrazzw68jxjkxr9cbdf1111pa64yj19"; }; diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index decb92615f9..6a0a2b2683d 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -2,7 +2,8 @@ }: with python2Packages; buildPythonApplication { - name = "escrotum-2019-06-10"; + pname = "escrotum"; + version = "unstable-2019-06-10"; src = fetchFromGitHub { owner = "Roger"; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index afe8a5ecbcc..6823f6bc20e 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "exiftags-1.01"; +stdenv.mkDerivation rec { + pname = "exiftags"; + version = "1.01"; src = fetchurl { - url = "https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz"; + url = "https://johnst.org/sw/exiftags/exiftags-${version}.tar.gz"; sha256 = "194ifl6hybx2a5x8jhlh9i56k3qfc6p2l72z0ii1b7v0bzg48myr"; }; diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 28deabb98d1..484a11e322a 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -9,10 +9,11 @@ # } stdenv.mkDerivation rec { - name = "fgallery-1.8.2"; + pname = "fgallery"; + version = "1.8.2"; src = fetchurl { - url = "https://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; + url = "https://www.thregr.org/~wavexx/software/fgallery/releases/fgallery-${version}.zip"; sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 9fe41d91db2..62b4ab6b303 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "icoutils-0.32.3"; + pname = "icoutils"; + version = "0.32.3"; src = fetchurl { - url = "mirror://savannah/icoutils/${name}.tar.bz2"; + url = "mirror://savannah/icoutils/icoutils-${version}.tar.bz2"; sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp"; }; diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix index a4b396c3d23..c04862610b6 100644 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: -stdenv.mkDerivation { - name = "jbig2enc-0.28"; +stdenv.mkDerivation rec { + pname = "jbig2enc"; + version = "0.28"; src = fetchurl { - url = "https://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz"; + url = "https://github.com/agl/jbig2enc/archive/${version}-dist.tar.gz"; sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; }; diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index cf10c92286c..e50716f7a5c 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, poppler }: stdenv.mkDerivation { - name = "leela-12.fe7a35a"; + pname = "leela"; + version = "12.fe7a35a"; src = fetchFromGitHub { owner = "TrilbyWhite"; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 30b69c862c3..dea9aa6d97e 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced - name = "netpbm-10.92.0"; + pname = "netpbm"; + version = "10.92.0"; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 72caf6f86ae..65ebd8ddbd1 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -7,10 +7,11 @@ with lib; stdenv.mkDerivation rec { - name = "optipng-0.7.7"; + pname = "optipng"; + version = "0.7.7"; src = fetchurl { - url = "mirror://sourceforge/optipng/${name}.tar.gz"; + url = "mirror://sourceforge/optipng/optipng-${version}.tar.gz"; sha256 = "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg"; }; diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 001b4cd174b..57cfe988b0b 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -6,10 +6,11 @@ # I'm only interested in making pstoedit convert to svg stdenv.mkDerivation rec { - name = "plotutils-2.6"; + pname = "plotutils"; + version = "2.6"; src = fetchurl { - url = "mirror://gnu/plotutils/${name}.tar.gz"; + url = "mirror://gnu/plotutils/plotutils-${version}.tar.gz"; sha256 = "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg"; }; diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 579dcad4ccb..266b85c54c5 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "pngcheck-3.0.2"; + pname = "pngcheck"; + version = "3.0.2"; src = fetchurl { - url = "mirror://sourceforge/png-mng/${name}.tar.gz"; + url = "mirror://sourceforge/png-mng/pngcheck-${version}.tar.gz"; sha256 = "sha256-DX4mLyQRb93yhHqM61yS2fXybvtC6f/2PsK7dnYTHKc="; }; diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 18a156ea504..16c710ceb79 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.8.13"; + pname = "pngcrush"; + version = "1.8.13"; src = fetchurl { - url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; + url = "mirror://sourceforge/pmt/pngcrush-${version}-nolib.tar.xz"; sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv"; }; diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix index bec86e20ce3..81f33c65af6 100644 --- a/pkgs/tools/graphics/pngnq/default.nix +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libpng, zlib }: stdenv.mkDerivation rec { - name = "pngnq-1.1"; + pname = "pngnq"; + version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/pngnq/${name}.tar.gz"; + url = "mirror://sourceforge/pngnq/pngnq-${version}.tar.gz"; sha256 = "1qmnnl846agg55i7h4vmrn11lgb8kg6gvs8byqz34bdkjh5gwiy1"; }; diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index d1d069c7ff7..c2de8a4fb2a 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -5,11 +5,12 @@ let else if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else throw "Unsupported system: ${stdenv.hostPlatform.system}"; in -stdenv.mkDerivation { - name = "pngout-20150319"; +stdenv.mkDerivation rec { + pname = "pngout"; + version = "20150319"; src = fetchurl { - url = "http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz"; + url = "http://static.jonof.id.au/dl/kenutils/pngout-${version}-linux.tar.gz"; sha256 = "0iwv941hgs2g7ljpx48fxs24a70m2whrwarkrb77jkfcd309x2h7"; }; diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index 7eabfb89d5a..7abf94f0a3e 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng }: -stdenv.mkDerivation { - name = "pngtoico-1.0"; +stdenv.mkDerivation rec { + pname = "pngtoico"; + version = "1.0"; src = fetchurl { - url = "mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz"; + url = "mirror://kernel/software/graphics/pngtoico/pngtoico-${version}.tar.gz"; sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph"; }; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 57e16a4925a..dd5b51041b1 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -4,10 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pstoedit-3.75"; + pname = "pstoedit"; + version = "3.75"; src = fetchurl { - url = "mirror://sourceforge/pstoedit/${name}.tar.gz"; + url = "mirror://sourceforge/pstoedit/pstoedit-${version}.tar.gz"; sha256 = "1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp"; }; diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index a6c9cd988c0..617ecbf90ee 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }: -stdenv.mkDerivation { - name = "transfig-3.2.4"; +stdenv.mkDerivation rec { + pname = "transfig"; + version = "3.2.4"; + src = fetchurl { - url = "ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz"; + url = "ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.${version}.tar.gz"; sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix index c1b12ca5fe7..e83e3c13ae3 100644 --- a/pkgs/tools/graphics/xcftools/default.nix +++ b/pkgs/tools/graphics/xcftools/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libpng, perl, gettext }: -stdenv.mkDerivation { - name = "xcftools-1.0.7"; +stdenv.mkDerivation rec { + pname = "xcftools"; + version = "1.0.7"; src = fetchurl { - url = "http://henning.makholm.net/xcftools/xcftools-1.0.7.tar.gz"; + url = "http://henning.makholm.net/xcftools/xcftools-${version}.tar.gz"; sha256 = "19i0x7yhlw6hd2gp013884zchg63yzjdj4hpany011il0n26vgqy"; }; From 8ded3090feb453db9ffa433443531ce6894d9adc Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 20:40:38 +0200 Subject: [PATCH 121/234] tools/inputmethods: replace name with pname&version --- pkgs/tools/inputmethods/anthy/default.nix | 5 +++-- pkgs/tools/inputmethods/m17n-db/default.nix | 5 +++-- pkgs/tools/inputmethods/m17n-lib/default.nix | 5 +++-- pkgs/tools/inputmethods/nabi/default.nix | 7 ++++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix index 03c692de8ec..23e2da0e41e 100644 --- a/pkgs/tools/inputmethods/anthy/default.nix +++ b/pkgs/tools/inputmethods/anthy/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "anthy-9100h"; + pname = "anthy"; + version = "9100h"; meta = with lib; { description = "Hiragana text to Kana Kanji mixed text Japanese input method"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://osdn/anthy/37536/${name}.tar.gz"; + url = "mirror://osdn/anthy/37536/anthy-${version}.tar.gz"; sha256 = "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"; }; } diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index 7feb14080e9..9344951dffe 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "m17n-db-1.8.0"; + pname = "m17n-db"; + version = "1.8.0"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/m17n/m17n-db-${version}.tar.gz"; sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"; }; diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index 51e52ce4e95..c80f9736311 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, m17n_db}: stdenv.mkDerivation rec { - name = "m17n-lib-1.8.0"; + pname = "m17n-lib"; + version = "1.8.0"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/m17n/m17n-lib-${version}.tar.gz"; sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"; }; diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 5b6b0223a01..72f13d4eb2d 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, libhangul }: -stdenv.mkDerivation { - name = "nabi-1.0.0"; +stdenv.mkDerivation rec { + pname = "nabi"; + version = "1.0.0"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-1.0.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-${version}.tar.gz"; sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; From 80e75cd53551e98bf60cb993305ac3a417b6c073 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 20:49:29 +0200 Subject: [PATCH 122/234] tools/filesystems: replace name with pname&version --- pkgs/tools/filesystems/9pfs/default.nix | 3 ++- pkgs/tools/filesystems/aefs/default.nix | 5 +++-- pkgs/tools/filesystems/archivemount/default.nix | 10 ++++------ pkgs/tools/filesystems/bonnie/default.nix | 6 ++++-- pkgs/tools/filesystems/ciopfs/default.nix | 5 +++-- pkgs/tools/filesystems/davfs2/default.nix | 5 +++-- pkgs/tools/filesystems/fsfs/default.nix | 8 +++++--- pkgs/tools/filesystems/genext2fs/default.nix | 7 ++++--- pkgs/tools/filesystems/httpfs/default.nix | 5 +++-- pkgs/tools/filesystems/jfsutils/default.nix | 5 +++-- pkgs/tools/filesystems/mtpfs/default.nix | 5 +++-- pkgs/tools/filesystems/netatalk/default.nix | 5 +++-- 12 files changed, 40 insertions(+), 29 deletions(-) diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index bf817a50873..03f082a4038 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, fuse }: stdenv.mkDerivation { - name = "9pfs-20150918"; + pname = "9pfs"; + version = "unstable-2015-09-18"; src = fetchFromGitHub { owner = "mischief"; diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index fb6fa01894e..c523255ddb0 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, fuse }: stdenv.mkDerivation rec { - name = "aefs-0.4pre259-8843b7c"; + pname = "aefs"; + version = "0.4pre259-8843b7c"; src = fetchurl { - url = "http://tarballs.nixos.org/${name}.tar.bz2"; + url = "http://tarballs.nixos.org/aefs-${version}.tar.bz2"; sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq"; }; diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 32c942aea5b..22e41611aef 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, fuse, libarchive }: -let - name = "archivemount-0.9.1"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "archivemount"; + version = "0.9.1"; src = fetchurl { - url = "https://www.cybernoia.de/software/archivemount/${name}.tar.gz"; + url = "https://www.cybernoia.de/software/archivemount/archivemount-${version}.tar.gz"; sha256 = "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5"; }; diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index e34e5289ad6..f2d55b47161 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "bonnie++-1.98"; + pname = "bonnie++"; + version = "1.98"; + src = fetchurl { - url = "https://www.coker.com.au/bonnie++/${name}.tgz"; + url = "https://www.coker.com.au/bonnie++/bonnie++-${version}.tgz"; sha256 = "010bmlmi0nrlp3aq7p624sfaj5a65lswnyyxk3cnz1bqig0cn2vf"; }; diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index cfe80cfce65..31311756ab4 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, fuse, glib, attr }: stdenv.mkDerivation rec { - name = "ciopfs-0.4"; + pname = "ciopfs"; + version = "0.4"; src = fetchurl { - url = "http://www.brain-dump.org/projects/ciopfs/${name}.tar.gz"; + url = "http://www.brain-dump.org/projects/ciopfs/ciopfs-${version}.tar.gz"; sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l"; }; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 7652cc97878..2b573f9afdb 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -9,10 +9,11 @@ }: stdenv.mkDerivation rec { - name = "davfs2-1.6.0"; + pname = "davfs2"; + version = "1.6.0"; src = fetchurl { - url = "mirror://savannah/davfs2/${name}.tar.gz"; + url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz"; sha256 = "sha256-LmtnVoW9kXdyvmDwmZrgmMgPef8g3BMej+xFR8u2O1A="; }; diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 114c83e84f4..836b94dc795 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -2,10 +2,12 @@ throw "It still does not build" -stdenv.mkDerivation { - name = "fsfs-0.1.1"; +stdenv.mkDerivation rec { + pname = "fsfs"; + version = "0.1.1"; + src = fetchurl { - url = "mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz"; + url = "mirror://sourceforge/fsfs/fsfs-${version}.tar.gz"; sha256 = "05wka9aq182li2r7gxcd8bb3rhpns7ads0k59v7w1jza60l57c74"; }; diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index ccc048f7572..dc0b902bf32 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "genext2fs-1.4.1"; +stdenv.mkDerivation rec { + pname = "genext2fs"; + version = "1.4.1"; src = fetchurl { - url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz"; + url = "mirror://sourceforge/genext2fs/genext2fs-${version}.tar.gz"; sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; }; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index f107add29c0..61843e4c65b 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -2,10 +2,11 @@ , docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }: stdenv.mkDerivation rec { - name = "httpfs2-0.1.5"; + pname = "httpfs2"; + version = "0.1.5"; src = fetchurl { - url = "mirror://sourceforge/httpfs/httpfs2/${name}.tar.gz"; + url = "mirror://sourceforge/httpfs/httpfs2/httpfs2-${version}.tar.gz"; sha256 = "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1"; }; diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index fadc639fbf6..290bc313910 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, libuuid, autoreconfHook }: stdenv.mkDerivation rec { - name = "jfsutils-1.1.15"; + pname = "jfsutils"; + version = "1.1.15"; src = fetchurl { - url = "http://jfs.sourceforge.net/project/pub/${name}.tar.gz"; + url = "http://jfs.sourceforge.net/project/pub/jfsutils-${version}.tar.gz"; sha256 = "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4"; }; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index e0b1cffe4dd..a2dc01f8c09 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, fuse, libmtp, glib, libmad, libid3tag }: stdenv.mkDerivation rec { - name = "mtpfs-1.1"; + pname = "mtpfs"; + version = "1.1"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse libmtp glib libid3tag libmad ]; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "https://www.adebenham.com/files/mtp/${name}.tar.gz"; + url = "https://www.adebenham.com/files/mtp/mtpfs-${version}.tar.gz"; sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; }; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 486963f44b9..258b25c3693 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -4,10 +4,11 @@ }: stdenv.mkDerivation rec { - name = "netatalk-3.1.12"; + pname = "netatalk"; + version = "3.1.12"; src = fetchurl { - url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; + url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2"; sha256 = "1ld5mnz88ixic21m6f0xcgf8v6qm08j6xabh1dzfj6x47lxghq0m"; }; From cb51834f9451fe115b3bd3e90909512ca094d9a3 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Thu, 12 Aug 2021 15:21:41 -0400 Subject: [PATCH 123/234] node-packages: Fix generate when running from a different directory. Previously it would try to run the build before changing directory which would fail to find the nixpkgs default.nix. Also simplified the script a little to remove the variable that was only used to change directory. --- pkgs/development/node-packages/generate.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index b58c71a088c..9e5162676dc 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash set -eu -o pipefail - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +cd "$( dirname "${BASH_SOURCE[0]}" )" node2nix=$(nix-build ../../.. -A nodePackages.node2nix) -cd "$DIR" rm -f ./node-env.nix ${node2nix}/bin/node2nix -i node-packages.json -o node-packages.nix -c composition.nix # using --no-out-link in nix-build argument would cause the From eaaea54a3730c9589c54e70293af58f8186d943e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 12 Aug 2021 21:36:42 +0200 Subject: [PATCH 124/234] hub: fix aarch64-darwin build --- .../version-management/git-and-tools/hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index e0d7e46d22a..9d63642dcb3 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, unixtools, nixosTests }: buildGoPackage rec { pname = "hub"; @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh"; }; - nativeBuildInputs = [ groff installShellFiles util-linux ]; + nativeBuildInputs = [ groff installShellFiles unixtools.col ]; postPatch = '' patchShebangs . From baca6e6b695df1c517210df363ad6df1f25706e6 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 12 Aug 2021 21:48:36 +0200 Subject: [PATCH 125/234] mu: 1.6.2 -> 1.6.3 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index e224cc33a03..468bc127228 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "EYERtDYIf0aw9nMLFZPGZ5s1i+erSq9H3tP29KwCAgQ="; + sha256 = "hmP2bcoBWMd2GZBE8XtJ5QePpWnkJV5pu69aDmL5V4g="; }; postPatch = lib.optionalString (batchSize != null) '' From e7e995ec2f50b5ecf202dba4eab65f4a919fec4a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 12 Aug 2021 20:07:05 +0000 Subject: [PATCH 126/234] nomacs: fix animated WebP support --- pkgs/applications/graphics/nomacs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 142c76b2f6d..9f3c1e453f8 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -8,6 +8,7 @@ , qtbase , qttools , qtsvg +, qtimageformats , exiv2 , opencv4 @@ -46,6 +47,7 @@ mkDerivation rec { buildInputs = [qtbase qttools qtsvg + qtimageformats exiv2 opencv4 libraw From 77a5cf85d54f1b90a906bd3babf711c9dfe2ca5c Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 12 Aug 2021 23:09:04 +0300 Subject: [PATCH 127/234] jitsi-meet-electron: 2.8.9 -> 2.8.10 --- .../instant-messengers/jitsi-meet-electron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 99f9f5aded9..6a98df12583 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.8.9"; + version = "2.8.10"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "sha256-PsMP0bDxlXAkRu3BgaUWcqnTfUKOGB81oHT94Xi8t8E="; + sha256 = "sha256-k++vumbhcMl9i4s8f04zOUAfYlA1g477FjrGuEGSD1U="; name = "${pname}-${version}.AppImage"; }; From b1ea381b62cff9da43ec418e7446e31b69e4015e Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 12 Aug 2021 23:19:19 +0300 Subject: [PATCH 128/234] nextcloud-client: 3.3.0 -> 3.3.1 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 7e769b7b0f7..0e9e6987e81 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-KMFFRxNQUNcu7Q5515lNbEMyCWIvzXXC//s3WAWxw4g="; + sha256 = "sha256-2oX3V84ScUV08/WaWJQPLJIni7KvJa/YBRBTWVdRO2U="; }; patches = [ From a29f2053935a9bdc42b2a95ded6ed6d9fe6735ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 12 Aug 2021 22:17:54 +0200 Subject: [PATCH 129/234] pinentry: fix darwin-aarch64 build --- pkgs/tools/security/pinentry/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 909bbbaed16..16a6f52348d 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -2,7 +2,9 @@ , libgpgerror, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , libcap ? null, libsecret ? null -, enabledFlavors ? [ "curses" "tty" "gtk2" "qt" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] +, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] + ++ lib.optionals stdenv.isLinux [ "gnome3" ] + ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ "qt" ] }: with lib; From 75959982e5a2b3c8c701842d151012404e2e5f1b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 22:28:38 +0200 Subject: [PATCH 130/234] games: replace name with pname&version --- pkgs/games/egoboo/default.nix | 11 ++++++----- pkgs/games/onscripter-en/default.nix | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 56ebcb1444e..158e81d9128 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -5,10 +5,11 @@ stdenv.mkDerivation rec { # they fix more, because it even has at least one bugs less than 2.7.4. # 2.8.0 does not start properly on linux # They just starting making that 2.8.0 work on linux. - name = "egoboo-2.7.3"; + pname = "egoboo"; + version = "2.7.3"; src = fetchurl { - url = "mirror://sourceforge/egoboo/${name}.tar.gz"; + url = "mirror://sourceforge/egoboo/egoboo-${version}.tar.gz"; sha256 = "18cjgp9kakrsa90jcb4cl8hhh9k57mi5d1sy5ijjpd3p7zl647hd"; }; @@ -22,10 +23,10 @@ stdenv.mkDerivation rec { # The user will need to have all the files in '.' to run egoboo, with # writeable controls.txt and setup.txt installPhase = '' - mkdir -p $out/share/${name} - cp -v game/egoboo $out/share/${name} + mkdir -p $out/share/egoboo-${version} + cp -v game/egoboo $out/share/egoboo-${version} cd .. - cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/${name} + cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/egoboo-${version} ''; buildInputs = [ libGLU libGL SDL SDL_mixer SDL_image SDL_ttf ]; diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index bcd33eb9892..82de61e4189 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation { - name = "onscripter-en-20110930"; + pname = "onscripter-en"; + version = "20110930"; src = fetchurl { # The website is not available now. From b3dc5fe3c3712a521d665df01246674f05198da2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Aug 2021 22:41:23 +0200 Subject: [PATCH 131/234] mautrix-signal: unstable-2021-07-01 -> unstable-2021-08-12 --- pkgs/servers/mautrix-signal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 76897d92820..365df2fec6f 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-signal"; - version = "unstable-2021-07-01"; + version = "unstable-2021-08-12"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-signal"; - rev = "56eb24412fcafb4836f29375fba9cc6db1715d6f"; - sha256 = "10nbfl48yb7h23znkxvkqh1dgp2xgldvxsigwfmwa1qbq0l4dljl"; + rev = "a592baaaa6c9ab7ec29edc84f069b9e9e2fc1b03"; + sha256 = "0rvidf4ah23x8m7k7hbkwm2xrs838wnli99gh99b5hr6fqmacbwl"; }; propagatedBuildInputs = with python3.pkgs; [ From 403ce1a9a3624e7b87606b99ea15f531fa17f8e7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 11 Aug 2021 22:57:23 +0200 Subject: [PATCH 132/234] chromiumBeta: Build with LLVM 13 --- pkgs/applications/networking/browsers/chromium/common.nix | 8 -------- .../applications/networking/browsers/chromium/default.nix | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8884148228b..120392d965e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -184,14 +184,6 @@ let commit = "60d5e803ef2a4874d29799b638754152285e0ed9"; sha256 = "0apmsqqlfxprmdmi3qzp3kr9jc52mcc4xzps206kwr8kzwv48b70"; }) - ] ++ lib.optionals (chromiumVersionAtLeast "93") [ - # We need to revert this patch to build M93 with LLVM 12. - (githubPatch { - # Reland "Replace 'blacklist' with 'ignorelist' in ./tools/msan/." - commit = "9d080c0934b848ee4a05013c78641e612fcc1e03"; - sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c"; - revert = true; - }) ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c157b64de64..db11bda740b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -38,7 +38,7 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "94") rec { + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "93") rec { llvmPackages = llvmPackages_13; stdenv = llvmPackages.stdenv; }); From badee4e70a70b126830fb3964c90e72edfafa1bc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 12 Aug 2021 22:47:41 +0200 Subject: [PATCH 133/234] chromiumBeta: 93.0.4577.25 -> 93.0.4577.42 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8c6c0ba4afe..e6912cc212d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "93.0.4577.25", - "sha256": "09v7wyy9xwrpzmsa030j8jjww30jps3lbvlq4bzppdg04fk6rbsn", - "sha256bin64": "1l86aqym4dxsrp81ppv5cwyki4wnh7cpqy4dw88kdxgqbiwwii27", + "version": "93.0.4577.42", + "sha256": "180lywcimhlcwbxmn37814hd96bqnqrp3whbzv6ln3hwca2da4hl", + "sha256bin64": "19px9h9vf9p2ipirv8ryaxvhfkls0nfiw7jz1d4h61r3r6ay5fc4", "deps": { "gn": { "version": "2021-07-08", From 66febf8ee5c46bb9c0a418996e6a013e345a3456 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Aug 2021 22:56:46 +0200 Subject: [PATCH 134/234] python3Packages.mautrix: 0.9.8 -> 0.10.2 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 9ab850ed010..d434068ed01 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.9.8"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "1yx9ybpw9ppym8k2ky5pxh3f2icpmk887i8ipwixrcrnml3q136p"; + sha256 = "sha256-D4lVTOiHdsMzqw/1kpNdvk3GX1y/stUaCCplXPu2/88="; }; propagatedBuildInputs = [ From a2d533dad3fb24c9e2e018cde157f65aa9a0ea0d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Aug 2021 23:19:09 +0200 Subject: [PATCH 135/234] python3Packages.telethon: 1.21.1 -> 1.23.0 --- pkgs/development/python-modules/telethon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index 041b102ce34..c4479ca6320 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.21.1"; + version = "1.23.0"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "sha256-mTyDfvdFrd+XKifXv7oM5Riihj0aUOBzclW3ZNI+DvI="; + sha256 = "sha256-unVRzkR+lUqtZ/PuukurdXTMoHosb0HlvmmQTm4OwxM="; }; patchPhase = '' From ebec5d0df135410510dbd5c6c7556e2d9f3bcc37 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 12 Aug 2021 14:20:05 -0700 Subject: [PATCH 136/234] linux_xanmod: 5.13.9 -> 5.13.10 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index c2f94a8a03b..e35df218b38 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.9"; + version = "5.13.10"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-cr5tmJVpjd9czlR1PklJccZ3wc+E1eJgQhhNooFEQ4I="; + sha256 = "sha256-f7Re9Nt6f9wqdfUgtHAvnGtSEBv6ULRAXYgQXa8RvDM="; }; structuredExtraConfig = with lib.kernel; { From 682f35087a1baef814620cfcb9e99b068a5cd65f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Aug 2021 23:24:30 +0200 Subject: [PATCH 137/234] mautrix-telegram: 0.10.0 -> unstable-2021-08-12 --- pkgs/servers/mautrix-telegram/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 41d0d5b0467..9764e4ab3e3 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -23,21 +23,24 @@ let in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.10.0"; + version = "unstable-2021-08-12"; disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { owner = "tulir"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-lLVKD+/pKqs8oWBdyL+R1lk22LqQOC9nbMlxhCK39xA="; + rev = "ec64c83cb01791525a39f937f3b847368021dce8"; + sha256 = "0rg4f4abdddhhf1xpz74y4468dv3mnm7k8nj161r1xszrk9f2n76"; }; patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ]; postPatch = '' sed -i -e '/alembic>/d' requirements.txt + substituteInPlace requirements.txt \ + --replace "telethon>=1.22,<1.23" "telethon" ''; + propagatedBuildInputs = with python.pkgs; ([ Mako aiohttp From 31a187510673af588984b5f2a4591e34ce7cfc64 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 12 Aug 2021 23:23:24 +0200 Subject: [PATCH 138/234] signal-desktop: 5.12.2 -> 5.13.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d062e3b74c0..df1ea452351 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.12.2"; # Please backport all updates to the stable channel. + version = "5.13.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0z8nphlm3q9gqri6bqh1iaayx5yy0bhrmjb7l7facdkm1aahmaa7"; + sha256 = "10qlavff7q1bdda60q0cia0fzi9y7ysaavrd4y8v0nzbmcz70abr"; }; nativeBuildInputs = [ From fadfb4715bb1690dedd50c3ab3c2dd7c29ff2fa3 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 13 Aug 2021 00:08:05 +0200 Subject: [PATCH 139/234] update-luarocks-package: fix issue with cache Cache was not initialized properly --- maintainers/scripts/update-luarocks-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index 5123f86e93d..6de97799846 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -110,7 +110,6 @@ class LuaEditor(Editor): return "luaPackages" def get_update(self, input_file: str, outfile: str, proc: int): - cache: Cache = Cache(self.cache_file) _prefetch = generate_pkg_nix def update() -> dict: From cfe5fae08ae9d4fd7e111e95f0593084cba451ee Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 13 Aug 2021 00:17:59 +0200 Subject: [PATCH 140/234] buildMaven: deprecate phases --- pkgs/development/java-modules/build-maven-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index 432f972b0ff..baa2eed89c9 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { find = ''find ${concatStringsSep " " (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; copy = ''cp -rsfu ${concatStringsSep " " (map (x: x + "/m2/*") flatDeps)} $out/m2''; - phases = [ "unpackPhase" "buildPhase" ]; + dontInstall = true; buildPhase = '' mkdir -p $out/target From 3cff074290c12bd2afdb8b755e09b1f8460449a4 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 13 Aug 2021 00:44:54 +0200 Subject: [PATCH 141/234] minergate{,-cli}: remove due to bad reputation --- .../misc/minergate-cli/default.nix | 36 ------------------- pkgs/applications/misc/minergate/default.nix | 36 ------------------- pkgs/top-level/aliases.nix | 4 ++- pkgs/top-level/all-packages.nix | 4 --- 4 files changed, 3 insertions(+), 77 deletions(-) delete mode 100644 pkgs/applications/misc/minergate-cli/default.nix delete mode 100644 pkgs/applications/misc/minergate/default.nix diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix deleted file mode 100644 index 0fe4103f613..00000000000 --- a/pkgs/applications/misc/minergate-cli/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, lib, stdenv, dpkg, makeWrapper, openssl }: - -stdenv.mkDerivation { - version = "8.2"; - pname = "minergate-cli"; - src = fetchurl { - url = "https://minergate.com/download/ubuntu-cli"; - sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8"; - }; - - nativeBuildInputs = [ dpkg makeWrapper ]; - - phases = [ "installPhase" ]; - - installPhase = '' - dpkg-deb -x $src $out - pgm=$out/opt/minergate-cli/minergate-cli - - interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 - patchelf --set-interpreter "$interpreter" $pgm - - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl stdenv.cc.cc ]} - - rm $out/usr/bin/minergate-cli - mkdir -p $out/bin - ln -s $pgm $out/bin - ''; - - meta = with lib; { - description = "Minergate CPU/GPU console client mining software"; - homepage = "https://www.minergate.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ bfortz ]; - platforms = [ "x86_64-linux" ]; -}; -} diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix deleted file mode 100644 index f6ec20b0df7..00000000000 --- a/pkgs/applications/misc/minergate/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, lib, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: - -stdenv.mkDerivation { - version = "8.1"; - pname = "minergate"; - src = fetchurl { - url = "https://minergate.com/download/ubuntu"; - sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13"; - }; - - nativeBuildInputs = [ dpkg makeWrapper ]; - - phases = [ "installPhase" ]; - - installPhase = '' - dpkg-deb -x $src $out - pgm=$out/opt/minergate/minergate - - interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 - patchelf --set-interpreter "$interpreter" $pgm - - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" - - rm $out/usr/bin/minergate - mkdir -p $out/bin - ln -s $out/opt/minergate/minergate $out/bin - ''; - - meta = with lib; { - description = "Minergate CPU/GPU mining software"; - homepage = "https://www.minergate.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ bfortz ]; - platforms = [ "x86_64-linux" ]; -}; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1cfda235b6c..5a16b3c9e55 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -473,7 +473,9 @@ mapAliases ({ mess = mame; # added 2019-10-30 mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 - mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 + minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 + minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5d5338c16d..9195d8ba28d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6590,10 +6590,6 @@ with pkgs; mhonarc = perlPackages.MHonArc; - minergate = callPackage ../applications/misc/minergate { }; - - minergate-cli = callPackage ../applications/misc/minergate-cli { }; - minica = callPackage ../tools/security/minica { }; minidlna = callPackage ../tools/networking/minidlna { }; From bde703a6bd2b219ee1733db4a93e7c1ff4d44980 Mon Sep 17 00:00:00 2001 From: Artturi Date: Fri, 13 Aug 2021 03:04:15 +0300 Subject: [PATCH 142/234] sha was wrong --- pkgs/development/tools/parsing/byacc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 6dbec5cfa9b..7f9aacd8ce7 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "sha256-87Dt1YSkJtoO4WduTtdITmL3d8MeozrPTInWXjLHXOo="; + sha256 = "sha256-8VhSm+nQWUJjx/Eah2FqSeoj5VrGNpElKiME+7x9OoM="; }; configureFlags = [ From 7f07184a8e6974592d1e8353be4b49b420e7c55d Mon Sep 17 00:00:00 2001 From: Phil Dyer Date: Fri, 13 Aug 2021 10:16:59 +1000 Subject: [PATCH 143/234] Add Patch for aarch64 --- pkgs/applications/science/math/R/default.nix | 1 + .../science/math/R/skip-check-for-aarch64.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/applications/science/math/R/skip-check-for-aarch64.patch diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index f016dc460c6..30bbb24d551 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { patches = [ ./no-usr-local-search-paths.patch + ./skip-check-for-aarch64.patch ]; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/science/math/R/skip-check-for-aarch64.patch b/pkgs/applications/science/math/R/skip-check-for-aarch64.patch new file mode 100644 index 00000000000..8721bf6b422 --- /dev/null +++ b/pkgs/applications/science/math/R/skip-check-for-aarch64.patch @@ -0,0 +1,11 @@ +diff -ur a/src/library/stats/man/nls.Rd b/src/library/stats/man/nls.Rd +--- a/src/library/stats/man/nls.Rd 2021-05-21 19:15:02.000000000 -0300 ++++ b/src/library/stats/man/nls.Rd 2021-08-12 12:39:00.094758280 -0300 +@@ -287,7 +287,7 @@ + options(digits = 10) # more accuracy for 'trace' + ## IGNORE_RDIFF_BEGIN + try(nlm1 <- update(nlmod, control = list(tol = 1e-7))) # where central diff. work here: +- (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE), trace=TRUE)) ++ (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE, warnOnly=TRUE), trace=TRUE)) + ## --> convergence tolerance 4.997e-8 (in 11 iter.) + ## IGNORE_RDIFF_END From a21caa7f193fd1e523fd79940c5473a97142d51a Mon Sep 17 00:00:00 2001 From: Phil Dyer Date: Fri, 13 Aug 2021 10:19:31 +1000 Subject: [PATCH 144/234] Remove unused fetchpatch from inputs --- pkgs/applications/science/math/R/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 30bbb24d551..5de644dfdfa 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack -, curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch +, curl, Cocoa, Foundation, libobjc, libcxx, tzdata , withRecommendedPackages ? true , enableStrictBarrier ? false # R as of writing does not support outputting both .so and .a files; it outputs: From d603e7c8b16ee1c38eb02e784626cdfb9feff7e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 00:39:43 +0000 Subject: [PATCH 145/234] agenda: 1.1.0 -> 1.1.1 --- pkgs/applications/office/agenda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index 9308fc6c6ea..8ed6aad1d9c 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "agenda"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "dahenson"; repo = pname; rev = version; - sha256 = "0yfapapsanqacaa83iagar88i335yy2jvay8y6z7gkri7avbs4am"; + sha256 = "sha256-K6ZtYllxBzLUPS2qeSxtplXqayB1m49sqmB28tHDS14="; }; nativeBuildInputs = [ From 3eca655208521af2097493e74473157bddbc807b Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 12 Aug 2021 18:29:53 +0900 Subject: [PATCH 146/234] oil: 0.8.12 -> 0.9.0 --- pkgs/shells/oil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 4d66f0d401d..38ff6a76818 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.12"; + version = "0.9.0"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-M8JdMru2DDcPWa7qQq9m1NQwjI7kVkHvK5I4W5U1XPU="; + sha256 = "sha256-xk4io2ZXVupU6mCqmD94k1AaE8Kk0cf3PIx28X6gNjY="; }; postPatch = '' From 954534a081026f6a87f183afbebc06b3891ea985 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 02:04:37 +0000 Subject: [PATCH 147/234] brave: 1.27.111 -> 1.28.105 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 019075592e8..924b9a7fb82 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.27.111"; + version = "1.28.105"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "nQkna1r8wSjTPEWp9RxOz45FVmz97NHzTlb4Hh5lXcs="; + sha256 = "1E2KWG5vHYBuph6Pv9J6FBOsUpegx4Ix/H99ZQ/x4zI="; }; dontConfigure = true; From 0220940e2ae79f70ab55d1795850c93055acf6bb Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 12 Aug 2021 17:57:33 +0900 Subject: [PATCH 148/234] vector: 0.15.1 -> 0.15.2 --- pkgs/tools/misc/vector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 392b03f21a3..49e07b7507a 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9Q0jRh8nlgiWslmlFAth8eff+hir5gIT8YL898FMSqk="; + sha256 = "sha256-u/KHiny9o/q74dh/w3cShAb6oEkMxNaTMF2lOFx+1po="; }; - cargoSha256 = "sha256-DFFA6t+ZgpGieq5kT80PW5ZSByIp54ia2UvcBYY2+Lg="; + cargoSha256 = "sha256-wUNF+810Yh4hPQzraWo2mDi8KSmRKp9Z9D+4kwKQ+IU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; From f564fa0aa2db55b1c262d43857ce674b8cfd1fd3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 02:29:35 +0000 Subject: [PATCH 149/234] cicero-tui: 0.2.1 -> 0.2.2 --- pkgs/tools/misc/cicero-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cicero-tui/default.nix b/pkgs/tools/misc/cicero-tui/default.nix index 72721020e12..249e814fd30 100644 --- a/pkgs/tools/misc/cicero-tui/default.nix +++ b/pkgs/tools/misc/cicero-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cicero-tui"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "eyeplum"; repo = "cicero-tui"; rev = "v${version}"; - sha256 = "sha256-FwjD+BdRc8y/g5MQLmBB/qkUj33cywbH2wjTp0y0s8A="; + sha256 = "sha256-j/AIuNE5WBNdUeXuKvvc4NqsVVk252tm4KR3w0e6bT8="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoSha256 = "sha256-JygEE7K8swbFvJ2aDXs+INhfoLuhy+LY7T8AUr4lgJY="; + cargoSha256 = "sha256-yup6hluGF2x+0XDwK+JETyNu4TFNPmqD4Y0Wthxrbcc="; meta = with lib; { description = "Unicode tool with a terminal user interface"; From 16adcc430c75c0382c2b1ae70d68a4f8eb03e887 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 11 Aug 2021 19:00:00 -0500 Subject: [PATCH 150/234] nodejs-12_x: 12.22.4 -> 12.22.5 https://github.com/nodejs/node/releases/tag/v12.22.5 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 66cf2e4904d..e59b7959420 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.4"; - sha256 = "0k6dwkhpmjcdb71zd92a5v0l82rsk06p57iyjby84lhy2fmlxka4"; + version = "12.22.5"; + sha256 = "057xhxk440pxlgqpblsh4vfwmfzy0fx1h6q3jr2j79y559ngy9zr"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 2a14fcb7f943d82e34ae68540fee6217d14a5d44 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 11 Aug 2021 19:01:00 -0500 Subject: [PATCH 151/234] nodejs-14_x: 14.17.4 -> 14.17.5 https://github.com/nodejs/node/releases/tag/v14.17.5 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 3b04f751b48..bad8ebfa5ae 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.4"; - sha256 = "0b6gadc53r07gx6qr6281ifr5m9bgprmfdqyz9zh5j7qhkkz8yxf"; + version = "14.17.5"; + sha256 = "1a0zj505nhpfcj19qvjy2hvc5a7gadykv51y0rc6032qhzzsgca2"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 898660842e9cde1e9b8ef154b25361cdaee3b612 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 11 Aug 2021 19:02:00 -0500 Subject: [PATCH 152/234] nodejs-16_x: 16.6.1 -> 16.6.2 https://github.com/nodejs/node/releases/tag/v16.6.2 --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index bee01d7aae2..e0aa5fb7bd3 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.6.1"; - sha256 = "0mz5wfhf2k1qf3d57h4r8b30izhyg93g5m9c8rljlzy6ih2ymcbr"; + version = "16.6.2"; + sha256 = "1svrkm2zq8dyvw2l7gvgm75x2fqarkbpc33970521r3iz6hwp547"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From d5d5bed95ed6a271bf3fa46f779c438b27057266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 13 Aug 2021 05:32:40 +0100 Subject: [PATCH 153/234] Update pkgs/tools/security/pinentry/default.nix Co-authored-by: Artturi --- pkgs/tools/security/pinentry/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 16a6f52348d..97426e0be80 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -2,7 +2,7 @@ , libgpgerror, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , libcap ? null, libsecret ? null -, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] +, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ "qt" ] }: From f76f19c9145f1c360975c8c9a907a3f34bc9efea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 04:48:14 +0000 Subject: [PATCH 154/234] lndmanage: 0.12.0 -> 0.13.0 --- pkgs/applications/blockchains/lndmanage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/lndmanage/default.nix b/pkgs/applications/blockchains/lndmanage/default.nix index 3c7e28d831e..450d9b4d444 100644 --- a/pkgs/applications/blockchains/lndmanage/default.nix +++ b/pkgs/applications/blockchains/lndmanage/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "lndmanage"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "bitromortac"; repo = pname; rev = "v${version}"; - sha256 = "1p73wdxv3fca2ga4nqpjk5lig7bj2v230lh8niw490p5y7hhnggl"; + sha256 = "1vnv03k2d11rw6mry6fmspiy3hqsza8y3daxnn4lp038gw1y0f4z"; }; propagatedBuildInputs = with python3Packages; [ From 934698a378d51610872495f8dfb8cb961e6cb56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 12 Aug 2021 07:25:28 +0200 Subject: [PATCH 155/234] nixos/nginx: make serverNamesHash{Bucket,Max}Size configurable --- .../services/web-servers/nginx/default.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index b8c571ace8d..653fe67cf96 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -171,6 +171,14 @@ let map_hash_max_size ${toString cfg.mapHashMaxSize}; ''} + ${optionalString (cfg.serverNamesHashBucketSize != null) '' + server_names_hash_bucket_size ${toString cfg.serverNamesHashBucketSize}; + ''} + + ${optionalString (cfg.serverNamesHashMaxSize != null) '' + server_names_hash_max_size ${toString cfg.serverNamesHashMaxSize}; + ''} + # $connection_upgrade is used for websocket proxying map $http_upgrade $connection_upgrade { default upgrade; @@ -643,6 +651,23 @@ in ''; }; + serverNamesHashBucketSize = mkOption { + type = types.nullOr types.ints.positive; + default = null; + description = '' + Sets the bucket size for the server names hash tables. Default + value depends on the processor’s cache line size. + ''; + }; + + serverNamesHashMaxSize = mkOption { + type = types.nullOr types.ints.positive; + default = null; + description = '' + Sets the maximum size of the server names hash tables. + ''; + }; + resolver = mkOption { type = types.submodule { options = { From 270d06865685e4edfa69d28625400560de04a7d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 05:45:17 +0000 Subject: [PATCH 156/234] nbstripout: 0.3.9 -> 0.5.0 --- pkgs/applications/version-management/nbstripout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 5e556b40a89..d7cd89f4de6 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -2,7 +2,7 @@ with python.pkgs; buildPythonApplication rec { - version = "0.3.9"; + version = "0.5.0"; pname = "nbstripout"; # Mercurial should be added as a build input but because it's a Python @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "b46dddbf78b8b137176bc72729124e378242ef9ce93af63f6e0a8c4850c972e7"; + sha256 = "86ab50136998d62c9fa92478d2eb9ddc4137e51a28568f78fa8f24a6fbb6a7d8"; }; # for some reason, darwin uses /bin/sh echo native instead of echo binary, so From 82a518ac3e3a06fca7b1b0a04e01ee39171c0cfd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 05:55:48 +0000 Subject: [PATCH 157/234] plex-mpv-shim: 1.10.0 -> 1.10.1 --- pkgs/applications/video/plex-mpv-shim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index d1b88da37fa..b82b7fd2436 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "18bd2nvlwzkmadimlkh7rs8rnp0ppfx1dzkxb11dq84pdpbl25pc"; + sha256 = "1ql7idkm916f1wlkqxqmq1i2pc94gbgq6pvb8szhb21icyy5d1y0"; }; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; From 71dc2805fdca84acd2dd7aae74c806939cd83453 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 06:00:45 +0000 Subject: [PATCH 158/234] tartube: 2.3.110 -> 2.3.332 --- pkgs/applications/video/tartube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 69f777541a4..74ce4446a19 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.3.110"; + version = "2.3.332"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "v${version}"; - sha256 = "0sdbd2lsc4bvgkwi55arjwbzwmq05abfmv6vsrvz4gsdv8s8wha5"; + sha256 = "1m7p4chpvbh4mswsymh89dksdgwhmnkpfbx9zi2jzqgkinfd6a2k"; }; nativeBuildInputs = [ From 28ea21857a4e476ee59c80fc1af05ac22a458d81 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 06:06:11 +0000 Subject: [PATCH 159/234] python38Packages.WSME: 0.10.1 -> 0.11.0 --- pkgs/development/python-modules/WSME/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index 118288acb59..624bb4388a5 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "WSME"; - version = "0.10.1"; + version = "0.11.0"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "34209b623635a905bcdbc654f53ac814d038da65e4c2bc070ea1745021984079"; + sha256 = "bd2dfc715bedcc8f4649611bc0c8a238f483dc01cff7102bc1efa6bea207b64b"; }; nativeBuildInputs = [ pbr ]; From cef17ad72c691466e97224fc9e148c82df84aa87 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 06:19:07 +0000 Subject: [PATCH 160/234] asuka: 0.8.1 -> 0.8.3 --- pkgs/applications/networking/browsers/asuka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index b0ef9d890d5..54b8a1d3156 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "asuka"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromSourcehut { owner = "~julienxx"; repo = pname; rev = version; - sha256 = "1y8v4qc5dng3v9k0bky1xlf3qi9pk2vdsi29lff4ha5310467f0k"; + sha256 = "sha256-l3SgIyApASllHVhAc2yoUYc2x7QtCdzBrMYaXCp65m8="; }; - cargoSha256 = "0b8wf12bjsy334g04sv3knw8f177xsmh7lrkyvx9gnn0fax0lmnr"; + cargoSha256 = "sha256-twECZM1KcWeQptLhlKlIz16r3Q/xMb0e+lBG+EX79mU="; nativeBuildInputs = [ pkg-config ]; From 38e924a1ab49a7d786950d97a0971a695431da09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Aug 2021 08:30:33 +0200 Subject: [PATCH 161/234] python3Packages.pymeteireann: 0.2 -> 0.3 --- pkgs/development/python-modules/pymeteireann/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymeteireann/default.nix b/pkgs/development/python-modules/pymeteireann/default.nix index 7e48a4089a1..304c22b0785 100644 --- a/pkgs/development/python-modules/pymeteireann/default.nix +++ b/pkgs/development/python-modules/pymeteireann/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pymeteireann"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "DylanGore"; repo = "PyMetEireann"; rev = version; - sha256 = "1904f8mvv4ghzbniswmdwyj5v71m6y3yn1b4grjvfds05skalm67"; + sha256 = "sha256-Y0qB5RZykuBk/PNtxikxjsv672NhS6yJWJeSdAe/MoU="; }; propagatedBuildInputs = [ From 4203caedab3dab07c998112cd7c00b17d53e45f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Aug 2021 08:33:57 +0200 Subject: [PATCH 162/234] python3Packages.pyvicare: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index f8cf1961543..2bed27e6e8c 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.5.1"; + version = "2.5.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-kddkVu1uj7/85wu5WHekbHewOxUq84bB6mk2pQHlFvY="; + sha256 = "sha256-Yur7ZtUBWmszo5KN4TDlLdSxzH5qL0mhJDFN74pH/ss="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 0262937ea70a2f8bf663cce88f6d07a25016f204 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Aug 2021 08:36:42 +0200 Subject: [PATCH 163/234] tfsec: 0.58.0 -> 0.58.1 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index d6b56b4ccff..19d93e131f6 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.58.0"; + version = "0.58.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aQlsqmssF9Be4vaUfBZxNQAyg6MsS3lAooalPQKRns0="; + sha256 = "sha256-oYGfwEXr26RepuwpRQ8hCiqLTpDvz7v9Lit5QY4mT4U="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From 157c41a9cfad1268de06f993afd868d28f45460e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 13 Aug 2021 08:40:35 +0200 Subject: [PATCH 164/234] dbeaver: 21.1.2 -> 21.1.4 --- pkgs/applications/misc/dbeaver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index a15157a9370..6b402de744a 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.1.2"; # When updating also update fetchedMavenDeps.sha256 + version = "21.1.4"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-3q5LTllyqw7s8unJHTuasBCM4iaJ9lLpwgbXwBGUtIw="; + sha256 = "jW4ZSHnjBHckfbcvhl+uTuNJb1hu77D6dzoSTA6y8l4="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-QPDnIXP3yB1Dn0LBbBBLvRDbCyguWvG9Zzb1Vjh72UA="; + outputHash = "1K3GvNUT+zC7e8pD15UUCHDRWD7dtxtl8MfAJIsuaYs="; }; nativeBuildInputs = [ From db3515c5fd46c145801a88ce15cb46973a3c84c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 13 Aug 2021 08:40:52 +0200 Subject: [PATCH 165/234] dbeaver: add mkg20001 as maintainer --- pkgs/applications/misc/dbeaver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 6b402de744a..e1ce1f2f215 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -150,6 +150,6 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; - maintainers = with maintainers; [ jojosch ]; + maintainers = with maintainers; [ jojosch mkg20001 ]; }; } From 704f33c888726e7845ca4afe6da64f87713e8104 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 8 May 2021 12:18:55 +0200 Subject: [PATCH 166/234] nixos/wireless: add one service per interface This sets up a different systemd service for each interface. This way each wpa_supplicant instance waits for his inteface to become ready using the respective device unit, and that only. The configuration file is still shared between all instances, though. This closes a longstanding "fixme" from cbfba81. --- nixos/modules/services/networking/connman.nix | 1 + .../services/networking/wpa_supplicant.nix | 199 +++++++++++------- 2 files changed, 121 insertions(+), 79 deletions(-) diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index 11f66b05df1..608672c6446 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -150,6 +150,7 @@ in { useDHCP = false; wireless = { enable = mkIf (!enableIwd) true; + dbusControlled = true; iwd = mkIf enableIwd { enable = true; }; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 0bd44fd1317..e50912da0d4 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -9,6 +9,23 @@ let cfg = config.networking.wireless; + # Content of wpa_supplicant.conf + generatedConfig = concatStringsSep "\n" ( + (mapAttrsToList mkNetwork cfg.networks) + ++ optional cfg.userControlled.enable (concatStringsSep "\n" + [ "ctrl_interface=/run/wpa_supplicant" + "ctrl_interface_group=${cfg.userControlled.group}" + "update_config=1" + ]) + ++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"'' + ++ optional (cfg.extraConfig != "") cfg.extraConfig); + + configFile = + if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable + then pkgs.writeText "wpa_supplicant.conf" generatedConfig + else "/etc/wpa_supplicant.conf"; + + # Creates a network block for wpa_supplicant.conf mkNetwork = ssid: opts: let quote = x: ''"${x}"''; @@ -34,20 +51,64 @@ let } ''; - generatedConfig = concatStringsSep "\n" ( - (mapAttrsToList mkNetwork cfg.networks) - ++ optional cfg.userControlled.enable (concatStringsSep "\n" - [ "ctrl_interface=/run/wpa_supplicant" - "ctrl_interface_group=${cfg.userControlled.group}" - "update_config=1" - ]) - ++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"'' - ++ optional (cfg.extraConfig != "") cfg.extraConfig); + # Creates a systemd unit for wpa_supplicant bound to a given (or any) interface + mkUnit = iface: + let + deviceUnit = optional (iface != null) "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device"; + configStr = if cfg.allowAuxiliaryImperativeNetworks + then "-c /etc/wpa_supplicant.conf -I ${configFile}" + else "-c ${configFile}"; + in { + description = "WPA Supplicant instance" + optionalString (iface != null) " for interface ${iface}"; - configFile = - if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable - then pkgs.writeText "wpa_supplicant.conf" generatedConfig - else "/etc/wpa_supplicant.conf"; + after = deviceUnit; + before = [ "network.target" ]; + wants = [ "network.target" ]; + requires = deviceUnit; + wantedBy = [ "multi-user.target" ]; + stopIfChanged = false; + + path = [ package ]; + + script = + '' + if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then + echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." + fi + + iface_args="-s ${optionalString cfg.dbusControlled "-u"} -D${cfg.driver} ${configStr}" + + ${if iface == null then '' + # detect interfaces automatically + + # check if there are no wireless interfaces + if ! find -H /sys/class/net/* -name wireless | grep -q .; then + # if so, wait until one appears + echo "Waiting for wireless interfaces" + grep -q '^ACTION=add' < <(stdbuf -oL -- udevadm monitor -s net/wlan -pu) + # Note: the above line has been carefully written: + # 1. The process substitution avoids udevadm hanging (after grep has quit) + # until it tries to write to the pipe again. Not even pipefail works here. + # 2. stdbuf is needed because udevadm output is buffered by default and grep + # may hang until more udev events enter the pipe. + fi + + # add any interface found to the daemon arguments + for name in $(find -H /sys/class/net/* -name wireless | cut -d/ -f 5); do + echo "Adding interface $name" + args+="''${args:+ -N} -i$name $iface_args" + done + '' else '' + # add known interface to the daemon arguments + args="-i${iface} $iface_args" + ''} + + # finally start daemon + exec wpa_supplicant $args + ''; + }; + + systemctl = "/run/current-system/systemd/bin/systemctl"; in { options = { @@ -61,6 +122,10 @@ in { description = '' The interfaces wpa_supplicant will use. If empty, it will automatically use all wireless interfaces. + + + A separate wpa_supplicant instance will be started for each interface. + ''; }; @@ -271,6 +336,15 @@ in { }; }; + dbusControlled = mkOption { + type = types.bool; + default = lib.length cfg.interfaces < 2; + description = '' + Whether to enable the DBus control interface. + This is only needed when using NetworkManager or connman. + ''; + }; + extraConfig = mkOption { type = types.str; default = ""; @@ -294,78 +368,45 @@ in { assertions = flip mapAttrsToList cfg.networks (name: cfg: { assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1; message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; - }); - - environment.systemPackages = [ package ]; - - services.dbus.packages = [ package ]; + }) ++ [ + { + assertion = length cfg.interfaces > 1 -> !cfg.dbusControlled; + message = + let daemon = if config.networking.networkmanager.enable then "NetworkManager" else + if config.services.connman.enable then "connman" else null; + n = toString (length cfg.interfaces); + in '' + It's not possible to run multiple wpa_supplicant instances with DBus support. + Note: you're seeing this error because `networking.wireless.interfaces` has + ${n} entries, implying an equal number of wpa_supplicant instances. + '' + optionalString (daemon != null) '' + You don't need to change `networking.wireless.interfaces` when using ${daemon}: + in this case the interfaces will be configured automatically for you. + ''; + } + ]; hardware.wirelessRegulatoryDatabase = true; - # FIXME: start a separate wpa_supplicant instance per interface. - systemd.services.wpa_supplicant = let - ifaces = cfg.interfaces; - deviceUnit = interface: [ "sys-subsystem-net-devices-${utils.escapeSystemdPath interface}.device" ]; - in { - description = "WPA Supplicant"; + environment.systemPackages = [ package ]; + services.dbus.packages = optional cfg.dbusControlled package; - after = lib.concatMap deviceUnit ifaces; - before = [ "network.target" ]; - wants = [ "network.target" ]; - requires = lib.concatMap deviceUnit ifaces; - wantedBy = [ "multi-user.target" ]; - stopIfChanged = false; + systemd.services = + if cfg.interfaces == [] + then { wpa_supplicant = mkUnit null; } + else listToAttrs (map (i: nameValuePair "wpa_supplicant-${i}" (mkUnit i)) cfg.interfaces); - path = [ package pkgs.udev ]; + # Restart wpa_supplicant after resuming from sleep + powerManagement.resumeCommands = concatStringsSep "\n" ( + optional (cfg.interfaces == []) "${systemctl} try-restart wpa_supplicant" + ++ map (i: "${systemctl} try-restart wpa_supplicant-${i}") cfg.interfaces + ); - script = let - configStr = if cfg.allowAuxiliaryImperativeNetworks - then "-c /etc/wpa_supplicant.conf -I ${configFile}" - else "-c ${configFile}"; - in '' - if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then - echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." - fi - - iface_args="-s -u -D${cfg.driver} ${configStr}" - - ${if ifaces == [] then '' - # detect interfaces automatically - - # check if there are no wireless interface - if ! find -H /sys/class/net/* -name wireless | grep -q .; then - # if so, wait until one appears - echo "Waiting for wireless interfaces" - grep -q '^ACTION=add' < <(stdbuf -oL -- udevadm monitor -s net/wlan -pu) - # Note: the above line has been carefully written: - # 1. The process substitution avoids udevadm hanging (after grep has quit) - # until it tries to write to the pipe again. Not even pipefail works here. - # 2. stdbuf is needed because udevadm output is buffered by default and grep - # may hang until more udev events enter the pipe. - fi - - # add any interface found to the daemon arguments - for name in $(find -H /sys/class/net/* -name wireless | cut -d/ -f 5); do - echo "Adding interface $name" - args+="''${args:+ -N} -i$name $iface_args" - done - '' else '' - # add known interfaces to the daemon arguments - args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" - ''} - - # finally start daemon - exec wpa_supplicant $args - ''; - }; - - powerManagement.resumeCommands = '' - /run/current-system/systemd/bin/systemctl try-restart wpa_supplicant - ''; - - # Restart wpa_supplicant when a wlan device appears or disappears. - services.udev.extraRules = '' - ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="/run/current-system/systemd/bin/systemctl try-restart wpa_supplicant.service" + # Restart wpa_supplicant when a wlan device appears or disappears. This is + # only needed when an interface hasn't been specified by the user. + services.udev.extraRules = optionalString (cfg.interfaces == []) '' + ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", \ + RUN+="${systemctl} try-restart wpa_supplicant.service" ''; }; From 0d082b464dcc303a95e01a37e0b117eeeddfc04e Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 8 May 2021 12:19:17 +0200 Subject: [PATCH 167/234] nixos/wireless: add rnhmjoj as maintainer --- nixos/modules/services/networking/wpa_supplicant.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index e50912da0d4..155c6fdd0ab 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -410,5 +410,5 @@ in { ''; }; - meta.maintainers = with lib.maintainers; [ globin ]; + meta.maintainers = with lib.maintainers; [ globin rnhmjoj ]; } From 3770c4b97f0c712386326225abf0a7a1041418ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 08:44:30 +0000 Subject: [PATCH 168/234] erigon: 2021.08.01 -> 2021.08.02 --- pkgs/applications/blockchains/erigon.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 0d6a395b05a..6cdad6bf5ff 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "erigon"; - version = "2021.08.01"; + version = "2021.08.02"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fjMkCCeQa/IHB4yXlL7Qi8J9wtZm90l3xIA72LeoW8M="; + sha256 = "sha256-pyqvzpsDk24UEtSx4qmDew9zRK45pD5i4Qv1uJ03tmk="; }; - vendorSha256 = "1vsgd19an592dblm9afasmh8cd0x2frw5pvnxkxd2fikhy2mibbs"; + vendorSha256 = "sha256-FwKlQH8vEtWNDql1pmHzKneIwmJ7cg5LYkETVswO6pc="; runVend = true; # Build errors in mdbx when format hardening is enabled: From a1f6cfbe647d2c981b0e1d0871bdfc05b151e162 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 09:01:56 +0000 Subject: [PATCH 169/234] exoscale-cli: 1.40.0 -> 1.40.2 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 90252174344..0ffa33a1673 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.40.0"; + version = "1.40.2"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-zhVG9mtkW0avMTtSnJ36qkxuy4SiiAENrKZqE5mXvaA="; + sha256 = "sha256-J5Wid/Xq3wYY+2/RoFgdY5ZDdNQu8TkTF9W6YLvnwvM="; }; goPackagePath = "github.com/exoscale/cli"; From 005f28eca8a755d750e49ddea348d14074310592 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Thu, 12 Aug 2021 22:15:20 +1000 Subject: [PATCH 170/234] liberation-circuit: init at 1.3 --- pkgs/games/liberation-circuit/default.nix | 71 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/games/liberation-circuit/default.nix diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/games/liberation-circuit/default.nix new file mode 100644 index 00000000000..478fd606376 --- /dev/null +++ b/pkgs/games/liberation-circuit/default.nix @@ -0,0 +1,71 @@ +{ stdenv, lib, fetchFromGitHub, fetchurl, cmake, git, makeWrapper, allegro5, libGL }: + +stdenv.mkDerivation rec { + pname = "liberation-circuit"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "linleyh"; + repo = pname; + rev = "v${version}"; + sha256 = "BAv0wEJw4pK77jV+1bWPHeqyU/u0HtZLBF3ETUoQEAk="; + }; + + patches = [ + # Linux packaging assets + (fetchurl { + url = "https://github.com/linleyh/liberation-circuit/commit/72c1f6f4100bd227540aca14a535e7f4ebdeb851.patch"; + sha256 = "0sad1z1lls0hanv88g1q6x5qr4s8f5p42s8j8v55bmwsdc0s5qys"; + }) + ]; + + # Hack to make binary diffs work + prePatch = '' + function patch { + git apply --whitespace=nowarn "$@" + } + ''; + + postPatch = '' + unset -f patch + substituteInPlace bin/launcher.sh --replace ./libcirc ./liberation-circuit + ''; + + nativeBuildInputs = [ cmake git makeWrapper ]; + buildInputs = [ allegro5 libGL ]; + + cmakeFlags = [ + "-DALLEGRO_LIBRARY=${lib.getDev allegro5}" + "-DALLEGRO_INCLUDE_DIR=${lib.getDev allegro5}/include" + ]; + + NIX_CFLAGS_LINK = "-lallegro_image -lallegro_primitives -lallegro_color -lallegro_acodec -lallegro_audio -lallegro_dialog -lallegro_font -lallegro_main -lallegro -lm"; + hardeningDisable = [ "format" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/opt + cd .. + cp -r bin $out/opt/liberation-circuit + chmod +x $out/opt/liberation-circuit/launcher.sh + makeWrapper $out/opt/liberation-circuit/launcher.sh $out/bin/liberation-circuit + + install -D linux-packaging/liberation-circuit.desktop $out/share/applications/liberation-circuit.desktop + install -D linux-packaging/liberation-circuit.appdata.xml $out/share/metainfo/liberation-circuit.appdata.xml + install -D linux-packaging/icon-256px.png $out/share/pixmaps/liberation-circuit.png + + runHook postInstall + ''; + + meta = with lib; { + description = "Real-time strategy game with programmable units"; + longDescription = '' + Escape from a hostile computer system! Harvest data to create an armada of battle-processes to aid your escape! Take command directly and play the game as an RTS, or use the game's built-in editor and compiler to write your own unit AI in a simplified version of C. + ''; + homepage = "https://linleyh.itch.io/liberation-circuit"; + maintainers = with maintainers; [ angustrau ]; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85a4be3fbeb..94abb040ee6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29426,6 +29426,8 @@ with pkgs; liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; + liberation-circuit = callPackage ../games/liberation-circuit { }; + lincity = callPackage ../games/lincity {}; lincity_ng = callPackage ../games/lincity/ng.nix { From d8f17593073ae4ea37953f8b5e354adbdbf084f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 13 Aug 2021 11:28:25 +0200 Subject: [PATCH 171/234] tartube-yt-dlp: init This adds another flavour of tartube with yt-dlp used instead of yt-dlp --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9de8b6ea03..b7c8de395f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9300,6 +9300,10 @@ with pkgs; tartube = callPackage ../applications/video/tartube { }; + tartube-yt-dlp = callPackage ../applications/video/tartube { + youtube-dl = yt-dlp; + }; + tayga = callPackage ../tools/networking/tayga { }; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; From 734965565d7283aa0513fe6e20452cc9bf04af08 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 10:28:14 +0000 Subject: [PATCH 172/234] go-ethereum: 1.10.6 -> 1.10.7 --- pkgs/applications/blockchains/go-ethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 28a7b22a24f..f087741254a 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,17 +9,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.6"; + version = "1.10.7"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4lapkoxSKdXlD6rmUxnlSKrfH+DeV6/wV05CqJjuzjA="; + sha256 = "sha256-P0+XPSpvVsjia21F3FIg7KO6Qe2ZbY90tM/dRwBBuBk="; }; runVend = true; - vendorSha256 = "sha256-5qi01y0SIEI0WRYu2I2RN94QFS8rrlioFvnRqqp6wtk="; + vendorSha256 = "sha256-51jt5oBb/3avZnDRfo/NKAtZAU6QBFkzNdVxFnJ+erM="; doCheck = false; From acc802ec9af5736168b54e83d3309d7f92ee6397 Mon Sep 17 00:00:00 2001 From: Yuka Date: Fri, 13 Aug 2021 12:46:21 +0200 Subject: [PATCH 173/234] thunderbird: fix update script (#133744) #130116 broke hydra eval by calling a non-existing file as updateScript --- .../networking/mailreaders/thunderbird/update.nix | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/update.nix diff --git a/pkgs/applications/networking/mailreaders/thunderbird/update.nix b/pkgs/applications/networking/mailreaders/thunderbird/update.nix new file mode 100644 index 00000000000..d6f1a007faa --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/update.nix @@ -0,0 +1,7 @@ +{ callPackage +, ... +}@args: + +callPackage ../../browsers/firefox/update.nix ({ + baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; +} // (builtins.removeAttrs args ["callPackage"])) From acf807192797fd1c07a295f7edb512097bf8092a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 10:59:16 +0000 Subject: [PATCH 174/234] grafana-agent: 0.18.1 -> 0.18.2 --- pkgs/servers/monitoring/grafana-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 6b9067d65da..c7c3fb37b70 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-sKD9ulA6iaaI5yMja0ohDlXDNH4jZzyJWlXdvJo3Q2g="; + sha256 = "sha256-yTCFMnOSRgMqL9KD26cYeJcQ1rrUBOf8I+i7IPExP9I="; }; vendorSha256 = "sha256-MZGOZB/mS3pmZuI35E/QkaNLLhbuW2DfZiih9OCXMj0="; From 271e13f9624caf0130ddeaa30d5bfb7b427f6ec5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 11:00:48 +0000 Subject: [PATCH 175/234] epiphany: 40.2 -> 40.3 --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 0b4191b2266..73c7a7aa113 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "dRGeIgZWV89w7ytgPU9zg1VzvQNPHmGMD2YkeP1saDU="; + sha256 = "2tE4ufLVXeJxEo/KOLYfU/2YDFh9KeG6a1CP/zsZ9WQ="; }; nativeBuildInputs = [ From 2373e7d55934d88c02cc1d6ef84dc45920973eaa Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 13 Aug 2021 13:31:56 +0200 Subject: [PATCH 176/234] live555: fix eval on unsupported platforms (#133732) --- pkgs/development/libraries/live555/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 85302bc7c96..081fa2f175b 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { i686-linux = "linux"; x86_64-linux = "linux-64bit"; aarch64-linux = "linux-64bit"; - }.${stdenv.hostPlatform.system}} + }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}")} runHook postConfigure ''; From d6dac81240b43b87b02012992297e615bb7fadd1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 08:49:29 +0000 Subject: [PATCH 177/234] esbuild: 0.12.19 -> 0.12.20 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index f8817ffe37e..1ff54223d08 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.19"; + version = "0.12.20"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-keYKYSWQOiO3d38qrMicYWRZ0jpkzhdZhqOr5JcbA4M="; + sha256 = "sha256-40r0f+bzzD0M97pbiSoVSJvVvcCizQvw9PPeXhw7U48="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; From 18ac0bdb28be53e368d0792ff94b424495b66e42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 11:23:17 +0000 Subject: [PATCH 178/234] headscale: 0.5.2 -> 0.6.0 --- pkgs/servers/headscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 86754710ff8..2c35d097b5b 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-AclIH2Gd8U/Hfy24KOFic/np4qAWELlIMfsPCSkdjog="; + sha256 = "sha256-RZwuoA9z+UnjQlqDqHMSaSKIuKu/qGBh5VBNrzeuac0="; }; - vendorSha256 = "sha256-UIBH6Pf2mmXBsdFW0RRvedLQhonNsrl4j2fxxRtum4M="; + vendorSha256 = "sha256-EnTp4KgFyNGCLK5p1mE0yJLdFrhsLsmsSGJnDyWUVKo="; # Ldflags are same as build target in the project's Makefile # https://github.com/juanfont/headscale/blob/main/Makefile From 78a389cf5a963bea2e1b0527687ffc8682e37955 Mon Sep 17 00:00:00 2001 From: Lucas Ransan Date: Thu, 12 Aug 2021 22:03:43 +0200 Subject: [PATCH 179/234] drawterm: init at unstable-2021-08-02 --- pkgs/tools/admin/drawterm/default.nix | 37 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/admin/drawterm/default.nix diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix new file mode 100644 index 00000000000..d3785a737f9 --- /dev/null +++ b/pkgs/tools/admin/drawterm/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, fetchgit +, xorg +}: + +stdenv.mkDerivation rec { + pname = "drawterm"; + version = "unstable-2021-08-02"; + + src = fetchgit { + url = "git://git.9front.org/plan9front/drawterm"; + rev = "a130d441722ac3f759d2d83b98eb6aef7e84f97e"; + sha256 = "R+W1XMqQqCrMwgX9lHRhxJPG6ZOvtQrU6HUsKfvfrBQ="; + }; + + buildInputs = [ + xorg.libX11 + xorg.libXt + ]; + + # TODO: macos + makeFlags = [ "CONF=unix" ]; + + installPhase = '' + install -Dm755 -t $out/bin/ drawterm + install -Dm644 -t $out/man/man1/ drawterm.1 + ''; + + meta = with lib; { + description = "Connect to Plan9 CPU servers from other operating systems."; + homepage = "https://drawterm.9front.org/"; + license = licenses.mit; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ef3ab8e60e..4f74455010d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23775,6 +23775,8 @@ in buildServerGui = false; }; + drawterm = callPackage ../tools/admin/drawterm { }; + droopy = python3Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; From 8c001a4464f384fac592a3a3ee60d14822845d00 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 13 Aug 2021 12:09:20 +0000 Subject: [PATCH 180/234] gfs2-utils: init at 3.4.1 --- pkgs/tools/filesystems/gfs2-utils/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/filesystems/gfs2-utils/default.nix diff --git a/pkgs/tools/filesystems/gfs2-utils/default.nix b/pkgs/tools/filesystems/gfs2-utils/default.nix new file mode 100644 index 00000000000..ba479b87aa9 --- /dev/null +++ b/pkgs/tools/filesystems/gfs2-utils/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl +, autoreconfHook, bison, flex, pkg-config +, bzip2, check, ncurses, util-linux, zlib +}: + +stdenv.mkDerivation rec { + pname = "gfs2-utils"; + version = "3.4.1"; + + src = fetchurl { + url = "https://pagure.io/gfs2-utils/archive/${version}/gfs2-utils-${version}.tar.gz"; + sha256 = "sha256-gwKxBBG5PtG4/RxX4sUC25ZeG8K2urqVkFDKL7NS4ZI="; + }; + + outputs = [ "bin" "doc" "out" "man" ]; + + nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; + buildInputs = [ bzip2 ncurses util-linux zlib ]; + + checkInputs = [ check ]; + doCheck = true; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://pagure.io/gfs2-utils"; + description = "Tools for creating, checking and working with gfs2 filesystems"; + maintainers = with maintainers; [ qyliss ]; + license = [ licenses.gpl2Plus licenses.lgpl2Plus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85a4be3fbeb..387676b7272 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5151,6 +5151,8 @@ with pkgs; gtk = gtk2; }; + gfs2-utils = callPackage ../tools/filesystems/gfs2-utils { }; + gfbgraph = callPackage ../development/libraries/gfbgraph { }; ggobi = callPackage ../tools/graphics/ggobi { }; From a3e27b8d21d911f2e0a581195d2f1fb4c636290a Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Fri, 13 Aug 2021 15:21:05 +0300 Subject: [PATCH 181/234] teleport: 7.0.0 -> 7.0.2 --- pkgs/servers/teleport/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index fc5910a1ae5..97c8568e403 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ lib, buildGoModule, zip, fetchFromGitHub, makeWrapper, xdg-utils }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils }: let webassets = fetchFromGitHub { owner = "gravitational"; @@ -10,14 +10,14 @@ let in buildGoModule rec { pname = "teleport"; - version = "7.0.0"; + version = "7.0.2"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-2GQ3IP5jfT6vSni5hfDex09wXrnUmTpcvH2S6zc399I="; + sha256 = "sha256-Sj7WQRgEiU5G/MDKFtEy/KJ2g0WENxbCnMA9CNcTUaY="; }; vendorSha256 = null; @@ -25,7 +25,7 @@ buildGoModule rec { subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; tags = [ "webassets_embed" ]; - nativeBuildInputs = [ zip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; patches = [ # https://github.com/NixOS/nixpkgs/issues/120738 @@ -41,7 +41,7 @@ buildGoModule rec { mkdir -p build echo "making webassets" cp -r ${webassets}/* webassets/ - make lib/web/build/webassets.zip + make lib/web/build/webassets ''; preCheck = '' From ef5f625c5c23ffada8ad34aae5d162a394bde084 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Fri, 13 Aug 2021 23:57:45 +1200 Subject: [PATCH 182/234] chrysalis: Expose udev rules --- pkgs/applications/misc/chrysalis/default.nix | 24 ++++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index 4d6a6943cde..55560c50f13 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -3,12 +3,15 @@ let pname = "chrysalis"; version = "0.8.4"; -in appimageTools.wrapType2 rec { +in appimageTools.wrapAppImage rec { name = "${pname}-${version}-binary"; - src = fetchurl { - url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "b41f3e23dac855b1588cff141e3d317f96baff929a0543c79fccee0c6f095bc7"; + src = appimageTools.extract { + inherit name; + src = fetchurl { + url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; + sha256 = "b41f3e23dac855b1588cff141e3d317f96baff929a0543c79fccee0c6f095bc7"; + }; }; profile = '' @@ -20,7 +23,18 @@ in appimageTools.wrapType2 rec { p.glib ]; - extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}"; + # Also expose the udev rules here, so it can be used as: + # services.udev.packages = [ pkgs.chrysalis ]; + # to allow non-root modifications to the keyboards. + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + mkdir -p $out/lib/udev/rules.d + ln -s \ + --target-directory=$out/lib/udev/rules.d \ + ${src}/resources/static/udev/60-kaleidoscope.rules + ''; meta = with lib; { description = "A graphical configurator for Kaleidoscope-powered keyboards"; From 5fc7992364b278e2aa93914a6adccffefcf2ed67 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 3 Aug 2021 12:22:13 +0000 Subject: [PATCH 183/234] rust-bindgen: use a better drv name for fakeRustup I saw a derivation called "rustup" building and was concerned why rust-bindgen would depend on rustup. If it had been called "fake-rustup", I wouldn't have had to check the package source to see what was going on. :) --- .../tools/rust/bindgen/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 267cc4fcfba..cc3907ba7f2 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeScriptBin +{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeTextFile , runtimeShell , bash }: @@ -38,12 +38,17 @@ rustPlatform.buildRustPackage rec { doCheck = true; checkInputs = - let fakeRustup = writeScriptBin "rustup" '' - #!${runtimeShell} - shift - shift - exec "$@" - ''; + let fakeRustup = writeTextFile { + name = "fake-rustup"; + executable = true; + destination = "/bin/rustup"; + text = '' + #!${runtimeShell} + shift + shift + exec "$@" + ''; + }; in [ rustfmt fakeRustup # the test suite insists in calling `rustup run nightly rustfmt` From f55f19f3637c94d97958a2015d9a5c006dbff3fc Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 13 Aug 2021 15:10:27 +0200 Subject: [PATCH 184/234] urserver: 3.9.0.2465 -> 3.10.0.2467 --- pkgs/servers/urserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/urserver/default.nix b/pkgs/servers/urserver/default.nix index 9047ea0ee34..392277eeedc 100644 --- a/pkgs/servers/urserver/default.nix +++ b/pkgs/servers/urserver/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "urserver"; - version = "3.9.0.2465"; + version = "3.10.0.2467"; src = fetchurl { url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion version) 3}/urserver-${version}.tar.gz"; - sha256 = "sha256-3DIroodWCMbq1fzPjhuGLk/2fY/qFxFISLzjkjJ4i90="; + sha256 = "sha256-IaLRhia6mb4h7x5MbBRtPJxJ3uTlkfOzmoTwYzwfbWA="; }; nativeBuildInputs = [ From ac2596594ca681f706210c5293df7e700b40b9c7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 13:12:21 +0000 Subject: [PATCH 185/234] python38Packages.azure-mgmt-containerservice: 16.0.0 -> 16.1.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index e903e553b44..9d172701bbc 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "16.0.0"; + version = "16.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11"; + sha256 = "3654c8ace2b8868d0ea9c4c78c74f51e86e23330c7d8a636d132253747e6f3f4"; }; propagatedBuildInputs = [ From 512885dc70335b8ab81e0010be6124ddb8a739e2 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Fri, 13 Aug 2021 06:26:52 -0700 Subject: [PATCH 186/234] libdnf: add zchunk support --- pkgs/tools/package-management/libdnf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 7a421aaeebf..5e1562fa431 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -1,5 +1,5 @@ { gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check -, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: +, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm, zchunk }: gcc9Stdenv.mkDerivation rec { pname = "libdnf"; @@ -26,6 +26,7 @@ gcc9Stdenv.mkDerivation rec { libsmartcols libyaml libmodulemd + zchunk ]; propagatedBuildInputs = [ @@ -51,7 +52,6 @@ gcc9Stdenv.mkDerivation rec { "-DWITH_GTKDOC=OFF" "-DWITH_HTML=OFF" "-DWITH_BINDINGS=OFF" - "-DWITH_ZCHUNK=OFF" ]; meta = with lib; { From 2fef603ef3971a0d391302b6e850ffad10c800e0 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Fri, 13 Aug 2021 15:47:17 +0200 Subject: [PATCH 187/234] libint: code generation and compilation separated, using cmake, fortran fortran compilation by cmake libint: more optimisations for SSE libint: avx switching based ony system configuration libint: split into 2 derivations libint: conditional fortran libint: parallel building by default libint: remove rec statement from mkDerivation --- pkgs/development/libraries/libint/default.nix | 155 ++++++++++-------- 1 file changed, 90 insertions(+), 65 deletions(-) diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix index 330fe8eac26..484125352ce 100644 --- a/pkgs/development/libraries/libint/default.nix +++ b/pkgs/development/libraries/libint/default.nix @@ -1,76 +1,101 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool -, python3, perl, gmpxx, mpfr, boost, eigen, gfortran -, enableFMA ? false +, python3, perl, gmpxx, mpfr, boost, eigen, gfortran, cmake +, enableFMA ? false, enableFortran ? true }: -stdenv.mkDerivation rec { - pname = "libint2"; +let + pname = "libint"; version = "2.6.0"; - src = fetchFromGitHub { - owner = "evaleev"; - repo = "libint"; - rev = "v${version}"; - sha256 = "0pbc2j928jyffhdp4x5bkw68mqmx610qqhnb223vdzr0n2yj5y19"; - }; - - patches = [ - ./fix-paths.patch - ]; - - nativeBuildInputs = [ - autoconf - automake - libtool - gfortran - mpfr - python3 - perl - gmpxx - ]; - - buildInputs = [ boost ]; - - enableParallelBuilding = true; - - doCheck = true; - - configureFlags = [ - "--enable-eri=2" - "--enable-eri3=2" - "--enable-eri2=2" - "--with-eri-max-am=7,5,4" - "--with-eri-opt-am=3" - "--with-eri3-max-am=7" - "--with-eri2-max-am=7" - "--with-g12-max-am=5" - "--with-g12-opt-am=3" - "--with-g12dkh-max-am=5" - "--with-g12dkh-opt-am=3" - "--enable-contracted-ints" - "--enable-shared" - ] ++ lib.optional enableFMA "--enable-fma"; - - preConfigure = '' - ./autogen.sh - ''; - - postBuild = '' - # build the fortran interface file - cd export/fortran - make libint_f.o ENABLE_FORTRAN=yes - cd ../.. - ''; - - postInstall = '' - cp export/fortran/libint_f.mod $out/include/ - ''; - meta = with lib; { description = "Library for the evaluation of molecular integrals of many-body operators over Gaussian functions"; homepage = "https://github.com/evaleev/libint"; license = with licenses; [ lgpl3Only gpl3Only ]; - maintainers = [ maintainers.markuskowa ]; + maintainers = with maintainers; [ markuskowa sheepforce ]; platforms = [ "x86_64-linux" ]; }; -} + + codeGen = stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "evaleev"; + repo = pname; + rev = "v${version}"; + sha256 = "0pbc2j928jyffhdp4x5bkw68mqmx610qqhnb223vdzr0n2yj5y19"; + }; + + patches = [ ./fix-paths.patch ]; + + nativeBuildInputs = [ + autoconf + automake + libtool + mpfr + python3 + perl + gmpxx + ] ++ lib.optional enableFortran gfortran; + + buildInputs = [ boost eigen ]; + + preConfigure = "./autogen.sh"; + + configureFlags = [ + "--enable-eri=2" + "--enable-eri3=2" + "--enable-eri2=2" + "--with-eri-max-am=7,5,4" + "--with-eri-opt-am=3" + "--with-eri3-max-am=7" + "--with-eri2-max-am=7" + "--with-g12-max-am=5" + "--with-g12-opt-am=3" + "--with-g12dkh-max-am=5" + "--with-g12dkh-opt-am=3" + "--enable-contracted-ints" + "--enable-shared" + ] ++ lib.optional enableFMA "--enable-fma" + ++ lib.optional enableFortran "--enable-fortran"; + + makeFlags = [ "export" ]; + + installPhase = '' + mkdir -p $out + cp ${pname}-${version}.tgz $out/. + ''; + + enableParallelBuilding = true; + + inherit meta; + }; + + codeComp = stdenv.mkDerivation { + inherit pname version; + + src = "${codeGen}/${pname}-${version}.tgz"; + + nativeBuildInputs = [ + python3 + cmake + ] ++ lib.optional enableFortran gfortran; + + buildInputs = [ boost eigen ]; + + # Default is just "double", but SSE2 is available on all x86_64 CPUs. + # AVX support is advertised, but does not work in 2.6 (possibly in 2.7). + # Fortran interface is incompatible with changing the LIBINT2_REALTYPE. + cmakeFlags = [ + (if enableFortran + then "-DENABLE_FORTRAN=ON" + else "-DLIBINT2_REALTYPE=libint2::simd::VectorSSEDouble" + ) + ]; + + # Can only build in the source-tree. A lot of preprocessing magic fails otherwise. + dontUseCmakeBuildDir = true; + + inherit meta; + }; + +in codeComp From 8d49f752de3f4ed91aa5d6acde299697b872c72e Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 13 Aug 2021 16:47:24 +0300 Subject: [PATCH 188/234] mympd: 7.0.2 -> 8.0.3 --- pkgs/applications/audio/mympd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index 03d0556326a..0336f8b36d5 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "mympd"; - version = "7.0.2"; + version = "8.0.3"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${version}"; - sha256 = "sha256-2V3LbgnJfTIO71quZ+hfLnw/lNLYxXt19jw2Od6BVvM="; + sha256 = "sha256-J37PH+yRSsPeNCdY2mslrjMoBwutm5xTSIt+TWyf21M="; }; nativeBuildInputs = [ pkg-config cmake ]; From 5af063cf32be8ce5281fac2e3aa28538b793758e Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 13 Aug 2021 15:57:39 +0200 Subject: [PATCH 189/234] libreddit: 0.10.1 -> 0.14.9 --- pkgs/servers/libreddit/add-Cargo.lock.patch | 1466 ------------------- pkgs/servers/libreddit/default.nix | 12 +- 2 files changed, 3 insertions(+), 1475 deletions(-) delete mode 100644 pkgs/servers/libreddit/add-Cargo.lock.patch diff --git a/pkgs/servers/libreddit/add-Cargo.lock.patch b/pkgs/servers/libreddit/add-Cargo.lock.patch deleted file mode 100644 index c1dc433c7fc..00000000000 --- a/pkgs/servers/libreddit/add-Cargo.lock.patch +++ /dev/null @@ -1,1466 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..dcb4875 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,1460 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "aho-corasick" -+version = "0.7.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" -+ -+[[package]] -+name = "askama" -+version = "0.10.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" -+dependencies = [ -+ "askama_derive", -+ "askama_escape", -+ "askama_shared", -+] -+ -+[[package]] -+name = "askama_derive" -+version = "0.10.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" -+dependencies = [ -+ "askama_shared", -+ "proc-macro2", -+ "syn", -+] -+ -+[[package]] -+name = "askama_escape" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" -+ -+[[package]] -+name = "askama_shared" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" -+dependencies = [ -+ "askama_escape", -+ "nom", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "async-mutex" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -+dependencies = [ -+ "event-listener", -+] -+ -+[[package]] -+name = "async-recursion" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "async-trait" -+version = "0.1.48" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "autocfg" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -+ -+[[package]] -+name = "base-x" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" -+ -+[[package]] -+name = "base64" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "bitvec" -+version = "0.19.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" -+dependencies = [ -+ "funty", -+ "radium", -+ "tap", -+ "wyz", -+] -+ -+[[package]] -+name = "bumpalo" -+version = "3.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" -+ -+[[package]] -+name = "bytes" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" -+ -+[[package]] -+name = "cached" -+version = "0.23.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e2afe73808fbaac302e39c9754bfc3c4b4d0f99c9c240b9f4e4efc841ad1b74" -+dependencies = [ -+ "async-mutex", -+ "async-trait", -+ "cached_proc_macro", -+ "cached_proc_macro_types", -+ "futures", -+ "hashbrown", -+ "once_cell", -+] -+ -+[[package]] -+name = "cached_proc_macro" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf857ae42d910aede5c5186e62684b0d7a597ce2fe3bd14448ab8f7ef439848c" -+dependencies = [ -+ "async-mutex", -+ "cached_proc_macro_types", -+ "darling", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "cached_proc_macro_types" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" -+ -+[[package]] -+name = "cc" -+version = "1.0.67" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "clap" -+version = "2.33.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -+dependencies = [ -+ "bitflags", -+ "textwrap", -+ "unicode-width", -+] -+ -+[[package]] -+name = "const_fn" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "076a6803b0dacd6a88cfe64deba628b01533ff5ef265687e6938280c1afd0a28" -+ -+[[package]] -+name = "cookie" -+version = "0.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffdf8865bac3d9a3bde5bde9088ca431b11f5d37c7a578b8086af77248b76627" -+dependencies = [ -+ "time", -+ "version_check", -+] -+ -+[[package]] -+name = "core-foundation" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" -+ -+[[package]] -+name = "ct-logs" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -+dependencies = [ -+ "sct", -+] -+ -+[[package]] -+name = "darling" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -+dependencies = [ -+ "darling_core", -+ "darling_macro", -+] -+ -+[[package]] -+name = "darling_core" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -+dependencies = [ -+ "fnv", -+ "ident_case", -+ "proc-macro2", -+ "quote", -+ "strsim", -+ "syn", -+] -+ -+[[package]] -+name = "darling_macro" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -+dependencies = [ -+ "darling_core", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "discard" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" -+ -+[[package]] -+name = "event-listener" -+version = "2.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" -+ -+[[package]] -+name = "fastrand" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3" -+dependencies = [ -+ "instant", -+] -+ -+[[package]] -+name = "fnv" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -+ -+[[package]] -+name = "form_urlencoded" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -+dependencies = [ -+ "matches", -+ "percent-encoding", -+] -+ -+[[package]] -+name = "funty" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" -+ -+[[package]] -+name = "futures" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-executor", -+ "futures-io", -+ "futures-sink", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-channel" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" -+dependencies = [ -+ "futures-core", -+ "futures-sink", -+] -+ -+[[package]] -+name = "futures-core" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" -+ -+[[package]] -+name = "futures-executor" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" -+dependencies = [ -+ "futures-core", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-io" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" -+ -+[[package]] -+name = "futures-lite" -+version = "1.11.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" -+dependencies = [ -+ "fastrand", -+ "futures-core", -+ "futures-io", -+ "memchr", -+ "parking", -+ "pin-project-lite", -+ "waker-fn", -+] -+ -+[[package]] -+name = "futures-macro" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" -+dependencies = [ -+ "proc-macro-hack", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "futures-sink" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" -+ -+[[package]] -+name = "futures-task" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" -+ -+[[package]] -+name = "futures-util" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-io", -+ "futures-macro", -+ "futures-sink", -+ "futures-task", -+ "memchr", -+ "pin-project-lite", -+ "pin-utils", -+ "proc-macro-hack", -+ "proc-macro-nested", -+ "slab", -+] -+ -+[[package]] -+name = "h2" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00" -+dependencies = [ -+ "bytes", -+ "fnv", -+ "futures-core", -+ "futures-sink", -+ "futures-util", -+ "http", -+ "indexmap", -+ "slab", -+ "tokio", -+ "tokio-util", -+ "tracing", -+] -+ -+[[package]] -+name = "hashbrown" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "http" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" -+dependencies = [ -+ "bytes", -+ "fnv", -+ "itoa", -+] -+ -+[[package]] -+name = "http-body" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5dfb77c123b4e2f72a2069aeae0b4b4949cc7e966df277813fc16347e7549737" -+dependencies = [ -+ "bytes", -+ "http", -+ "pin-project-lite", -+] -+ -+[[package]] -+name = "httparse" -+version = "1.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc35c995b9d93ec174cf9a27d425c7892722101e14993cd227fdb51d70cf9589" -+ -+[[package]] -+name = "httpdate" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" -+ -+[[package]] -+name = "hyper" -+version = "0.14.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" -+dependencies = [ -+ "bytes", -+ "futures-channel", -+ "futures-core", -+ "futures-util", -+ "h2", -+ "http", -+ "http-body", -+ "httparse", -+ "httpdate", -+ "itoa", -+ "pin-project", -+ "socket2", -+ "tokio", -+ "tower-service", -+ "tracing", -+ "want", -+] -+ -+[[package]] -+name = "hyper-rustls" -+version = "0.22.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" -+dependencies = [ -+ "ct-logs", -+ "futures-util", -+ "hyper", -+ "log", -+ "rustls", -+ "rustls-native-certs", -+ "tokio", -+ "tokio-rustls", -+ "webpki", -+] -+ -+[[package]] -+name = "ident_case" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -+ -+[[package]] -+name = "idna" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" -+dependencies = [ -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "indexmap" -+version = "1.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" -+dependencies = [ -+ "autocfg", -+ "hashbrown", -+] -+ -+[[package]] -+name = "instant" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" -+ -+[[package]] -+name = "js-sys" -+version = "0.3.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "lexical-core" -+version = "0.7.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" -+dependencies = [ -+ "arrayvec", -+ "bitflags", -+ "cfg-if", -+ "ryu", -+ "static_assertions", -+] -+ -+[[package]] -+name = "libc" -+version = "0.2.93" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" -+ -+[[package]] -+name = "libreddit" -+version = "0.10.1" -+dependencies = [ -+ "askama", -+ "async-recursion", -+ "cached", -+ "clap", -+ "cookie", -+ "futures-lite", -+ "hyper", -+ "hyper-rustls", -+ "regex", -+ "route-recognizer", -+ "serde", -+ "serde_json", -+ "time", -+ "tokio", -+ "url", -+] -+ -+[[package]] -+name = "lock_api" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176" -+dependencies = [ -+ "scopeguard", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "matches" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+ -+[[package]] -+name = "memchr" -+version = "2.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" -+ -+[[package]] -+name = "mio" -+version = "0.7.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" -+dependencies = [ -+ "libc", -+ "log", -+ "miow", -+ "ntapi", -+ "winapi", -+] -+ -+[[package]] -+name = "miow" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "nom" -+version = "6.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" -+dependencies = [ -+ "bitvec", -+ "funty", -+ "lexical-core", -+ "memchr", -+ "version_check", -+] -+ -+[[package]] -+name = "ntapi" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "once_cell" -+version = "1.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" -+ -+[[package]] -+name = "openssl-probe" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+ -+[[package]] -+name = "parking" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" -+ -+[[package]] -+name = "parking_lot" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -+dependencies = [ -+ "instant", -+ "lock_api", -+ "parking_lot_core", -+] -+ -+[[package]] -+name = "parking_lot_core" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -+dependencies = [ -+ "cfg-if", -+ "instant", -+ "libc", -+ "redox_syscall", -+ "smallvec", -+ "winapi", -+] -+ -+[[package]] -+name = "percent-encoding" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+ -+[[package]] -+name = "pin-project" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" -+dependencies = [ -+ "pin-project-internal", -+] -+ -+[[package]] -+name = "pin-project-internal" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "pin-project-lite" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" -+ -+[[package]] -+name = "pin-utils" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -+ -+[[package]] -+name = "proc-macro-hack" -+version = "0.5.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -+ -+[[package]] -+name = "proc-macro-nested" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "radium" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" -+ -+[[package]] -+name = "redox_syscall" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "regex" -+version = "1.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" -+ -+[[package]] -+name = "ring" -+version = "0.16.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -+dependencies = [ -+ "cc", -+ "libc", -+ "once_cell", -+ "spin", -+ "untrusted", -+ "web-sys", -+ "winapi", -+] -+ -+[[package]] -+name = "route-recognizer" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "824172f0afccf3773c3905f5550ac94572144efe0deaf49a1f22bbca188d193e" -+ -+[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+dependencies = [ -+ "semver", -+] -+ -+[[package]] -+name = "rustls" -+version = "0.19.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" -+dependencies = [ -+ "base64", -+ "log", -+ "ring", -+ "sct", -+ "webpki", -+] -+ -+[[package]] -+name = "rustls-native-certs" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -+dependencies = [ -+ "openssl-probe", -+ "rustls", -+ "schannel", -+ "security-framework", -+] -+ -+[[package]] -+name = "ryu" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -+ -+[[package]] -+name = "schannel" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -+dependencies = [ -+ "lazy_static", -+ "winapi", -+] -+ -+[[package]] -+name = "scopeguard" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -+ -+[[package]] -+name = "sct" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -+dependencies = [ -+ "ring", -+ "untrusted", -+] -+ -+[[package]] -+name = "security-framework" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" -+dependencies = [ -+ "bitflags", -+ "core-foundation", -+ "core-foundation-sys", -+ "libc", -+ "security-framework-sys", -+] -+ -+[[package]] -+name = "security-framework-sys" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+dependencies = [ -+ "semver-parser", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+ -+[[package]] -+name = "serde" -+version = "1.0.125" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.125" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.64" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" -+dependencies = [ -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "sha1" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" -+ -+[[package]] -+name = "signal-hook-registry" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "slab" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -+ -+[[package]] -+name = "smallvec" -+version = "1.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" -+ -+[[package]] -+name = "socket2" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "spin" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -+ -+[[package]] -+name = "standback" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -+dependencies = [ -+ "version_check", -+] -+ -+[[package]] -+name = "static_assertions" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -+ -+[[package]] -+name = "stdweb" -+version = "0.4.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -+dependencies = [ -+ "discard", -+ "rustc_version", -+ "stdweb-derive", -+ "stdweb-internal-macros", -+ "stdweb-internal-runtime", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "stdweb-derive" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "serde", -+ "serde_derive", -+ "syn", -+] -+ -+[[package]] -+name = "stdweb-internal-macros" -+version = "0.2.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -+dependencies = [ -+ "base-x", -+ "proc-macro2", -+ "quote", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "sha1", -+ "syn", -+] -+ -+[[package]] -+name = "stdweb-internal-runtime" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" -+ -+[[package]] -+name = "strsim" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" -+ -+[[package]] -+name = "syn" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "tap" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "time" -+version = "0.2.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372" -+dependencies = [ -+ "const_fn", -+ "libc", -+ "standback", -+ "stdweb", -+ "time-macros", -+ "version_check", -+ "winapi", -+] -+ -+[[package]] -+name = "time-macros" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -+dependencies = [ -+ "proc-macro-hack", -+ "time-macros-impl", -+] -+ -+[[package]] -+name = "time-macros-impl" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" -+dependencies = [ -+ "proc-macro-hack", -+ "proc-macro2", -+ "quote", -+ "standback", -+ "syn", -+] -+ -+[[package]] -+name = "tinyvec" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" -+dependencies = [ -+ "tinyvec_macros", -+] -+ -+[[package]] -+name = "tinyvec_macros" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -+ -+[[package]] -+name = "tokio" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" -+dependencies = [ -+ "autocfg", -+ "bytes", -+ "libc", -+ "memchr", -+ "mio", -+ "num_cpus", -+ "once_cell", -+ "parking_lot", -+ "pin-project-lite", -+ "signal-hook-registry", -+ "tokio-macros", -+ "winapi", -+] -+ -+[[package]] -+name = "tokio-macros" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "tokio-rustls" -+version = "0.22.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -+dependencies = [ -+ "rustls", -+ "tokio", -+ "webpki", -+] -+ -+[[package]] -+name = "tokio-util" -+version = "0.6.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5143d049e85af7fbc36f5454d990e62c2df705b3589f123b71f441b6b59f443f" -+dependencies = [ -+ "bytes", -+ "futures-core", -+ "futures-sink", -+ "log", -+ "pin-project-lite", -+ "tokio", -+] -+ -+[[package]] -+name = "tower-service" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" -+ -+[[package]] -+name = "tracing" -+version = "0.1.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" -+dependencies = [ -+ "cfg-if", -+ "pin-project-lite", -+ "tracing-core", -+] -+ -+[[package]] -+name = "tracing-core" -+version = "0.1.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" -+dependencies = [ -+ "lazy_static", -+] -+ -+[[package]] -+name = "try-lock" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -+dependencies = [ -+ "matches", -+] -+ -+[[package]] -+name = "unicode-normalization" -+version = "0.1.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" -+dependencies = [ -+ "tinyvec", -+] -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" -+ -+[[package]] -+name = "untrusted" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -+ -+[[package]] -+name = "url" -+version = "2.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" -+dependencies = [ -+ "form_urlencoded", -+ "idna", -+ "matches", -+ "percent-encoding", -+] -+ -+[[package]] -+name = "version_check" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" -+ -+[[package]] -+name = "waker-fn" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" -+ -+[[package]] -+name = "want" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -+dependencies = [ -+ "log", -+ "try-lock", -+] -+ -+[[package]] -+name = "wasm-bindgen" -+version = "0.2.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" -+dependencies = [ -+ "cfg-if", -+ "wasm-bindgen-macro", -+] -+ -+[[package]] -+name = "wasm-bindgen-backend" -+version = "0.2.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" -+dependencies = [ -+ "bumpalo", -+ "lazy_static", -+ "log", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro" -+version = "0.2.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" -+dependencies = [ -+ "quote", -+ "wasm-bindgen-macro-support", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro-support" -+version = "0.2.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-backend", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-shared" -+version = "0.2.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" -+ -+[[package]] -+name = "web-sys" -+version = "0.3.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "webpki" -+version = "0.21.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -+dependencies = [ -+ "ring", -+ "untrusted", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "wyz" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 374c0d1e368..d7b710af0a2 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,25 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.10.1"; + version = "0.14.9"; src = fetchFromGitHub { owner = "spikecodes"; repo = pname; rev = "v${version}"; - sha256 = "0f5xla6fgq4l9g95gwwvfxksaxj4zpayrsjacf53akjpxaqvqxdj"; + sha256 = "1z3qhlf0i4s3jqh0dml75912sikdvv2hxclai4my6wryk78v6099"; }; - cargoSha256 = "039k6kncdgy6q2lbcssj5dm9npk0yss5m081ps4nmdj2vjrkphf0"; + cargoSha256 = "0qdxhj9i3rhhnyla2glb2b45c51kyam8qg0038banwz9nw86jdjf"; buildInputs = lib.optional stdenv.isDarwin Security; - cargoPatches = [ - # Patch file to add/update Cargo.lock in the source code - # https://github.com/spikecodes/libreddit/issues/191 - ./add-Cargo.lock.patch - ]; - passthru.tests = { inherit (nixosTests) libreddit; }; From ce9cf43c4fa3d120936893eebd086cea75b9de45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 14:04:57 +0000 Subject: [PATCH 190/234] python38Packages.azure-mgmt-redis: 12.0.0 -> 13.0.0 --- pkgs/development/python-modules/azure-mgmt-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index fb43f130ba3..79045a4b4ba 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-redis"; - version = "12.0.0"; + version = "13.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8ae563e3df82a2f206d0483ae6f05d93d0d1835111c0bbca7236932521eed356"; + sha256 = "283f776afe329472c20490b1f2c21c66895058cb06fb941eccda42cc247217f1"; }; propagatedBuildInputs = [ From 18993ff63c1554a8e337b7ec208301d99a7adc90 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 13 Aug 2021 16:23:05 +0200 Subject: [PATCH 191/234] eid-mw: 5.0.23 -> 5.0.28 --- pkgs/tools/security/eid-mw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index a2a6caf2b11..2b373360965 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.0.23"; + version = "5.0.28"; src = fetchFromGitHub { - rev = "v${version}"; - sha256 = "0annkm0hqhkpjmfa6ywvzgn1n9619baqdzdbhjfhzfi4hf7mml1d"; - repo = "eid-mw"; owner = "Fedict"; + repo = "eid-mw"; + rev = "v${version}"; + sha256 = "rrrzw8i271ZZkwY3L6aRw2Nlz+GmDr/1ahYYlUBvtzo="; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ]; From 251e2a74d3f37a49c01c3b82d858aecf213f28e4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 12:12:32 +0000 Subject: [PATCH 192/234] python38Packages.azure-mgmt-batch: 15.0.0 -> 16.0.0 --- pkgs/development/python-modules/azure-mgmt-batch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 5f4b005b6ef..c153534cc64 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "15.0.0"; + version = "16.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb"; + sha256 = "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34"; }; propagatedBuildInputs = [ From 838af67e1a5dbe0d57b7c8c432da16ef83317ddc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 12:17:14 +0000 Subject: [PATCH 193/234] python38Packages.azure-mgmt-containerinstance: 7.0.0 -> 8.0.0 --- .../python-modules/azure-mgmt-containerinstance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 7a4d8005c9e..9d83e092f5d 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "7.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9f624df0664ba80ba886bc96ffe5e468c620eb5b681bc3bc2a28ce26042fd465"; + sha256 = "7aeb380af71fc35a71d6752fa25eb5b95fdb2a0027fa32e6f50bce87e2622916"; }; propagatedBuildInputs = [ From 14b2250e419c0dac9fcbf04dd6895b66c84a3735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 13 Aug 2021 17:11:25 +0200 Subject: [PATCH 194/234] fdk-aac: cleanup, format --- pkgs/development/libraries/fdk-aac/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 725593ead14..a94c204c2f7 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , exampleSupport ? false # Example encoding program }: -with lib; stdenv.mkDerivation rec { pname = "fdk-aac"; version = "2.0.2"; @@ -12,14 +13,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-yehjDPnUM/POrXSQahUg0iI/ibzT+pJUhhAXRAuOsi8="; }; - configureFlags = [ ] - ++ optional exampleSupport "--enable-example"; + configureFlags = lib.optional exampleSupport "--enable-example"; - meta = { + meta = with lib; { description = "A high-quality implementation of the AAC codec from Android"; - homepage = "https://sourceforge.net/projects/opencore-amr/"; - license = licenses.asl20; + homepage = "https://sourceforge.net/projects/opencore-amr/"; + license = licenses.asl20; maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; + platforms = platforms.all; }; } From d527a12d1ed6f567ccd5d0667bdc572069dc9c0b Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Fri, 13 Aug 2021 15:43:35 +0000 Subject: [PATCH 195/234] footswitch: init at unstable-2021-03-17 (#133691) Co-authored-by: Sandro --- .../tools/inputmethods/footswitch/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/inputmethods/footswitch/default.nix diff --git a/pkgs/tools/inputmethods/footswitch/default.nix b/pkgs/tools/inputmethods/footswitch/default.nix new file mode 100644 index 00000000000..9cfdbd393bd --- /dev/null +++ b/pkgs/tools/inputmethods/footswitch/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, hidapi }: + +stdenv.mkDerivation { + pname = "footswitch"; + version = "unstable-20201-03-17"; + + src = fetchFromGitHub { + owner = "rgerganov"; + repo = "footswitch"; + rev = "aa0b10f00d3e76dac27b55b88c8d44c0c406f7f0"; + sha256 = "sha256-SikYiBN7jbH5I1x5wPCF+buwFp1dt35cVxAN6lWkTN0="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ hidapi ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace /usr/local $out \ + --replace /usr/bin/install install \ + --replace /etc/udev/rules.d $out/lib/udev/rules.d + ''; + + preInstall = '' + mkdir -p $out/bin $out/lib/udev/rules.d + ''; + + meta = with lib; { + description = "Command line utlities for programming PCsensor and Scythe foot switches."; + homepage = "https://github.com/rgerganov/footswitch"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ baloo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4db7fa5c265..2b695e580de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4958,6 +4958,8 @@ with pkgs; fontmatrix = libsForQt514.callPackage ../applications/graphics/fontmatrix {}; + footswitch = callPackage ../tools/inputmethods/footswitch { }; + foremost = callPackage ../tools/system/foremost { }; forktty = callPackage ../os-specific/linux/forktty {}; From 28d83087819f8be898a8bd4c659763ebf4f95d04 Mon Sep 17 00:00:00 2001 From: Geoff Reedy Date: Fri, 13 Aug 2021 09:58:38 -0600 Subject: [PATCH 196/234] unipicker: use absolute path for fzf unipicker referenced fzf without an absolute path so even though it is included in buildInputs the package does not work out-of-the-box. The reference is replaced with an absolute path. Fixes #133775 --- pkgs/applications/misc/unipicker/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/unipicker/default.nix b/pkgs/applications/misc/unipicker/default.nix index 7ec284f402d..71854884272 100644 --- a/pkgs/applications/misc/unipicker/default.nix +++ b/pkgs/applications/misc/unipicker/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { preInstall = '' substituteInPlace unipicker --replace "/etc/unipickerrc" "$out/etc/unipickerrc" substituteInPlace unipickerrc --replace "/usr/local" "$out" + substituteInPlace unipicker --replace "fzf" "${fzf}/bin/fzf" + substituteInPlace unipickerrc --replace "fzf" "${fzf}/bin/fzf" ''; makeFlags = [ From 9506c958ee6fd8b37c154bce05fba773a1ffa045 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 16:55:15 +0000 Subject: [PATCH 197/234] python38Packages.celery: 5.1.1 -> 5.1.2 --- pkgs/development/python-modules/celery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index a48f8651298..cd6d21b7c65 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "celery"; - version = "5.1.1"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "54436cd97b031bf2e08064223240e2a83d601d9414bcb1b702f94c6c33c29485"; + sha256 = "8d9a3de9162965e97f8e8cc584c67aad83b3f7a267584fa47701ed11c3e0d4b0"; }; # click is only used for the repl, in most cases this shouldn't impact From 9c915a61f5f21ebd6dff5c6e2877d245ac549694 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 13 Aug 2021 20:20:53 +0300 Subject: [PATCH 198/234] libfilezilla: 0.30.0 -> 0.31.1 --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 8107ff3c98e..2e0b77d812f 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.30.0"; + version = "0.31.1"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-wW322s2y3tT24FFBtGge2pGloboFKQCiSp+E5lpQ3EA="; + sha256 = "sha256-mX1Yh7YBXzhp03Wwy8S0lC/LJNvktDRohclGz+czFm8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 9cbe3b1e3d502570f5730e72bdadaf42df3237bc Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 13 Aug 2021 20:29:16 +0300 Subject: [PATCH 199/234] xwallpaper: 0.7.0 -> 0.7.3 --- pkgs/tools/X11/xwallpaper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix index d99a6ec8dac..a05ef18dc99 100644 --- a/pkgs/tools/X11/xwallpaper/default.nix +++ b/pkgs/tools/X11/xwallpaper/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "xwallpaper"; - version = "0.7.0"; + version = "0.7.3"; src = fetchFromGitHub { owner = "stoeckmann"; repo = "xwallpaper"; rev = "v${version}"; - sha256 = "1bpymspnllbscha8j9y67w9ck2l6yv66zdbknv8s13hz5qi1ishk"; + sha256 = "sha256-O4VynpP3VJY/p6+NLUuKetwoMfbp93aXTiRoQJkgW+c="; }; nativeBuildInputs = [ pkg-config autoreconfHook installShellFiles ]; From 0aada0e458d5dc5f43c64a2e10d29dfc33ca0e21 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 13 Aug 2021 20:48:26 +0300 Subject: [PATCH 200/234] kid3: 3.8.6 -> 3.8.7 --- pkgs/applications/audio/kid3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 7f8015e7143..7dd5594a9a9 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-R4gAWlCw8RezhYbw1XDo+wdp797IbLoM3wqHwr+ul6k="; + sha256 = "sha256-Dr+NLh5ajG42jRKt1Swq6mccPfuAXRvhhoTNuO8lnI0="; }; nativeBuildInputs = [ From 94551d296e84bf66ec77884d47cfbedf75aa5df5 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 13 Aug 2021 21:13:03 +0300 Subject: [PATCH 201/234] blender: 2.93.1 -> 2.93.2 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 26ca3898134..59de6879783 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "2.93.1"; + version = "2.93.2"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "sha256-IdriOBw/DlpH6B0GKqC1nKnhTZwrIL8U9hkMS20BHNg="; + sha256 = "sha256-nG1Kk6UtiCwsQBDz7VELcMRVEovS49QiO3haIpvSfu4="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; From 53fc34dcf0dcd60783d4df74f5cd35a685185d2f Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Thu, 12 Aug 2021 10:20:11 +0200 Subject: [PATCH 202/234] listadmin: init at 2.73 fixes #133239 --- .../networking/listadmin/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/perl-packages.nix | 14 ++++++ 3 files changed, 64 insertions(+) create mode 100644 pkgs/applications/networking/listadmin/default.nix diff --git a/pkgs/applications/networking/listadmin/default.nix b/pkgs/applications/networking/listadmin/default.nix new file mode 100644 index 00000000000..f33b6ff0a1c --- /dev/null +++ b/pkgs/applications/networking/listadmin/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenvNoCC, fetchurl, makeWrapper, perl, installShellFiles }: + +stdenvNoCC.mkDerivation rec { + pname = "listadmin"; + version = "2.73"; + + src = fetchurl { + url = "mirror://sourceforge/project/listadmin/${version}/listadmin-${version}.tar.gz"; + sha256 = "00333d65ygdbm1hqr4yp2j8vh1cgh3hyfm7iy9y1alf0p0f6aqac"; + }; + + buildInputs = [ perl ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + # There is a Makefile, but we don’t need it, and it prints errors + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + install -m 755 listadmin.pl $out/bin/listadmin + installManPage listadmin.1 + + wrapProgram $out/bin/listadmin \ + --prefix PERL5LIB : "${with perl.pkgs; makeFullPerlPath [ + TextReform NetINET6Glue LWPProtocolhttps + ]}" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/listadmin --help 2> /dev/null + ''; + + meta = with lib; { + description = "Command line mailman moderator queue manipulation"; + longDescription = '' + listadmin is a command line tool to manipulate the queues of messages + held for moderator approval by mailman. It is designed to keep user + interaction to a minimum, in theory you could run it from cron to prune + the queue. It can use the score from a header added by SpamAssassin to + filter, or it can match specific senders, subjects, or reasons. + ''; + homepage = "https://sourceforge.net/projects/listadmin/"; + license = licenses.publicDomain; + platforms = platforms.unix; + maintainers = with maintainers; [ nomeata ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cff389cf951..96e3ff0255d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19887,6 +19887,8 @@ with pkgs; mailman-web = with python3.pkgs; toPythonApplication mailman-web; + listadmin = callPackage ../applications/networking/listadmin {}; + maker-panel = callPackage ../tools/misc/maker-panel { }; mastodon = callPackage ../servers/mastodon { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fb2f2db19d8..7f51a0406d2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15181,6 +15181,20 @@ let }; }; + NetINET6Glue = buildPerlPackage { + pname = "Net-INET6Glue"; + version = "0.604"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SU/SULLR/Net-INET6Glue-0.604.tar.gz"; + sha256 = "05xvbdrqq88npzg14bjm9wmjykzplwirzcm8rp61852hz6c67hwh"; + }; + meta = { + homepage = "https://github.com/noxxi/p5-net-inet6glue"; + description = "Make common modules IPv6 ready by hotpatching"; + license = lib.licenses.artistic1; + }; + }; + NetAddrIP = buildPerlPackage { pname = "NetAddr-IP"; version = "4.079"; From cfda443b6874f37a2373626a616c005de5635a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= <238528+smancill@users.noreply.github.com> Date: Fri, 13 Aug 2021 14:41:59 -0400 Subject: [PATCH 203/234] mkvtoolnix: 59.0.0 -> 60.0.0 (#133688) Use stdenv.mkDerivation instead of mkDerivation from libsForQt5, because the latter forces the compiler to LLVM 5 on Darwin, which doesn't support the new C++ filesystem library. Fixes #132675. --- pkgs/applications/video/mkvtoolnix/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 8557c47ad77..7cffcd923ff 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, mkDerivation , fetchFromGitLab , pkg-config , autoreconfHook @@ -46,15 +45,15 @@ let ''; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "59.0.0"; + version = "60.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-bPypOsveXrkz1V961b9GTJKFdgru/kcW15z/yik/4yQ="; + sha256 = "sha256-WtEC/EH0G1Tm6OK6hmVRzloLkO8mxxOYYZY7k/Wi2zE="; }; nativeBuildInputs = [ From 8dcfd8f20a77b5a9369de6ed690ebdd44175fc89 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Fri, 13 Aug 2021 11:53:09 -0700 Subject: [PATCH 204/234] openjdk11: fix the share/man symlink on darwin --- pkgs/development/compilers/openjdk/darwin/11.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index ae045ddfdba..0b158a16932 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -65,6 +65,12 @@ let EOF ''; + # fixupPhase is moving the man to share/man which breaks it because it's a + # relative symlink. + postFixup = '' + ln -nsf ../zulu-11.jdk/Contents/Home/man $out/share/man + ''; + passthru = { home = jdk; }; From a786475685769797df7fdd5387735efc151f623a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 13 Aug 2021 21:48:40 +0200 Subject: [PATCH 205/234] lua-format: ini at 1.3.6 --- pkgs/tools/misc/lua-format/default.nix | 32 +++++++++ .../tools/misc/lua-format/fix-lib-paths.patch | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 101 insertions(+) create mode 100644 pkgs/tools/misc/lua-format/default.nix create mode 100644 pkgs/tools/misc/lua-format/fix-lib-paths.patch diff --git a/pkgs/tools/misc/lua-format/default.nix b/pkgs/tools/misc/lua-format/default.nix new file mode 100644 index 00000000000..9aad25ce729 --- /dev/null +++ b/pkgs/tools/misc/lua-format/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4, libargs, catch2, cmake, libyamlcpp }: + +stdenv.mkDerivation rec { + pname = "lua-format"; + version = "1.3.6"; + + src = fetchFromGitHub { + owner = "Koihik"; + repo = "LuaFormatter"; + rev = version; + sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0"; + }; + + patches = [ + (substituteAll { + src = ./fix-lib-paths.patch; + antlr4RuntimeCpp = antlr4.runtime.cpp.dev; + inherit libargs catch2 libyamlcpp; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ antlr4.runtime.cpp libyamlcpp ]; + + meta = with lib; { + description = "Code formatter for Lua"; + homepage = "https://github.com/Koihik/LuaFormatter"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/misc/lua-format/fix-lib-paths.patch b/pkgs/tools/misc/lua-format/fix-lib-paths.patch new file mode 100644 index 00000000000..fce2347d8e0 --- /dev/null +++ b/pkgs/tools/misc/lua-format/fix-lib-paths.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a21b94..0ac7911 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -67,10 +67,10 @@ endif() + + include_directories( + ${PROJECT_SOURCE_DIR}/generated/ +- ${PROJECT_SOURCE_DIR}/third_party/ +- ${PROJECT_SOURCE_DIR}/third_party/Catch2/single_include +- ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include +- ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src ++ @libargs@/include ++ @catch2@/include ++ @libyamlcpp@/include ++ @antlr4RuntimeCpp@/include/antlr4-runtime + ${PROJECT_SOURCE_DIR}/src/ + ) + +@@ -92,9 +92,6 @@ file(GLOB_RECURSE yaml-cpp-src + ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/src/*.cpp + ) + +-add_library (antlr4-cpp-runtime ${antlr4-cpp-src}) +-add_library (yaml-cpp ${yaml-cpp-src}) +- + add_executable(lua-format ${src_dir} src/main.cpp) + + if(WIN32) +@@ -104,7 +101,7 @@ endif() + + set_target_properties(lua-format PROPERTIES LINKER_LANGUAGE CXX) + +-target_link_libraries(lua-format yaml-cpp antlr4-cpp-runtime ${extra-libs}) ++target_link_libraries(lua-format yaml-cpp antlr4-runtime ${extra-libs}) + + install(TARGETS lua-format + RUNTIME DESTINATION bin +@@ -135,7 +132,7 @@ if(BUILD_TESTS) + endif() + + target_compile_definitions(lua-format-test PUBLIC PROJECT_PATH="${PROJECT_SOURCE_DIR}") +- target_link_libraries(lua-format-test yaml-cpp antlr4-cpp-runtime ${extra-libs}) ++ target_link_libraries(lua-format-test yaml-cpp antlr4-runtime ${extra-libs}) + + add_test(NAME args COMMAND lua-format-test [args]) + add_test(NAME config COMMAND lua-format-test [config]) +diff --git a/src/main.cpp b/src/main.cpp +index 38962a2..332aad6 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -1,4 +1,4 @@ +-#include ++#include + #include + #include + #include +diff --git a/test/test_args.cpp b/test/test_args.cpp +index 69a5746..b988d00 100644 +--- a/test/test_args.cpp ++++ b/test/test_args.cpp +@@ -1,4 +1,4 @@ +-#include ++#include + #include + #include + #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5d5338c16d..3a01044331f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -970,6 +970,8 @@ with pkgs; logseq = callPackage ../applications/misc/logseq { }; + lua-format = callPackage ../tools/misc/lua-format { }; + lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; microcom = callPackage ../applications/terminal-emulators/microcom { }; From d3f53e7c4f049f7f12ffc8de2d6e7f34b4a2aebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 13 Aug 2021 21:51:48 +0200 Subject: [PATCH 206/234] libargs: init at 6.2.6 --- .../development/libraries/libargs/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/libargs/default.nix diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix new file mode 100644 index 00000000000..f4395d134bc --- /dev/null +++ b/pkgs/development/libraries/libargs/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "args"; + version = "6.2.6"; + + src = fetchFromGitHub { + owner = "Taywee"; + repo = pname; + rev = version; + sha256 = "sha256-g5OXuZNi5bkWuSg7SNmhA6vyHUOFU8suYkH8nGx6tvg="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A simple header-only C++ argument parser library"; + homepage = "https://github.com/Taywee/args"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a01044331f..7cb6c741e9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16348,6 +16348,8 @@ with pkgs; libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; }; libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; + libargs = callPackage ../development/libraries/libargs { }; + libarchive = callPackage ../development/libraries/libarchive { autoreconfHook = buildPackages.autoreconfHook269; }; From 6df3b14b1581976180a7c3be26f7623b12e22e7b Mon Sep 17 00:00:00 2001 From: Sam Doshi Date: Fri, 13 Aug 2021 21:19:56 +0100 Subject: [PATCH 207/234] calibre: add missing jeepney dependency fixes #133595 --- pkgs/applications/misc/calibre/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 85a644e5f1b..7ba83e7923e 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -87,6 +87,7 @@ mkDerivation rec { feedparser html2text html5-parser + jeepney lxml markdown mechanize From 0f37ce9a4c95e089955fcb139bd642236a8e9534 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Fri, 13 Aug 2021 22:22:20 +0200 Subject: [PATCH 208/234] sieve-connect: use installManPage (#133717) --- pkgs/applications/networking/sieve-connect/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix index 11a9a4fbc2a..d752dab1567 100644 --- a/pkgs/applications/networking/sieve-connect/default.nix +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages, installShellFiles }: stdenv.mkDerivation rec { pname = "sieve-connect"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perlPackages.perl ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; preBuild = '' # Fixes failing build when not building in git repo @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { buildFlags = [ "PERL5LIB=${perlPackages.makePerlPath [ perlPackages.FileSlurp ]}" "bin" "man" ]; installPhase = '' - mkdir -p $out/bin $out/share/man/man1 + mkdir -p $out/bin install -m 755 sieve-connect $out/bin - install -m 644 sieve-connect.1 $out/share/man/man1 + installManPage sieve-connect.1 wrapProgram $out/bin/sieve-connect \ --prefix PERL5LIB : "${with perlPackages; makePerlPath [ From 494c91275a966c9881edd155ea63247074977252 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 14 Aug 2021 00:40:11 +0300 Subject: [PATCH 209/234] filezilla: 3.55.0 -> 3.55.1 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 56dd02e9786..59478265529 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.55.0"; + version = "3.55.1"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-rnDrQYDRNr4pu61vzdGI5JfiBfxBbqPkE9znzYyrnII="; + sha256 = "sha256-Z/jQ4R9T/SMgfTy/yULQPz4j7kOe5IoUohQ8mVD3dqU="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 From 8c64f5f057bbadb2f929c82c823f09461a4aaf1c Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Thu, 12 Aug 2021 21:00:23 -0400 Subject: [PATCH 210/234] rtsp-simple-server: 0.15.4 -> 0.17.1 --- pkgs/servers/rtsp-simple-server/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index baf364cfece..df4825149f2 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,22 +5,24 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.15.4"; + version = "0.17.1"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6XdX4HEjDRt9WtqyHIv/NLt7IytNDeJLgCeTHTGybRI="; + sha256 = "sha256-8g9taSFEprJEEPM0hrbCf5QDE41uVdgVVIWjhfEICpU="; }; - vendorSha256 = "sha256-T5LWbxYsKnG5eaYLR/rms6+2DXv2lV9o39BvF7HapZY="; + vendorSha256 = "sha256-buQW5jMnHyHc/oYdmfTnoktFRG3V3SNxn7t5mAwmiJI="; # Tests need docker doCheck = false; buildFlagsArray = [ - "-ldflags=-X main.Version=${version}" + # In the future, we might need to switch to `main.Version`, considering: + # https://github.com/aler9/rtsp-simple-server/issues/503 + "-ldflags=-X github.com/aler9/rtsp-simple-server/internal/core.version=v${version}" ]; meta = with lib; { From 5dd2fc3d8fc3c7c21f3d1b2058455c11af596764 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Aug 2021 23:49:36 +0200 Subject: [PATCH 211/234] python3Packages.slack-sdk: 3.8.0 -> 3.9.0 --- pkgs/development/python-modules/slack-sdk/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index a52d3144aad..fcf0cdd06d8 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -8,7 +8,8 @@ , fetchFromGitHub , flake8 , flask-sockets -, isPy3k +, moto +, pythonOlder , psutil , pytest-asyncio , pytestCheckHook @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.8.0"; - disabled = !isPy3k; + version = "3.9.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-r3GgcU4K2jj+4aIytpY2HiVqHzChynn2BCn1VNTL2t0="; + sha256 = "sha256-9iV/l2eX4WB8PkTz+bMJIshdD/Q3K0ig8hIK9R8S/oM="; }; propagatedBuildInputs = [ @@ -43,6 +44,7 @@ buildPythonPackage rec { databases flake8 flask-sockets + moto psutil pytest-asyncio pytestCheckHook From c3a546f1f186e8a11ea08210a0dbc30aa814bb67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Aug 2021 23:52:48 +0200 Subject: [PATCH 212/234] python3Packages.adax: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/adax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adax/default.nix b/pkgs/development/python-modules/adax/default.nix index 849d0d9cf8c..867b08e28a3 100644 --- a/pkgs/development/python-modules/adax/default.nix +++ b/pkgs/development/python-modules/adax/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "adax"; - version = "0.1.0"; + version = "0.1.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyadax"; rev = version; - sha256 = "06qk8xbv8lsaabdpi6pclnbkp3vmb4k18spahldazqj8235ii237"; + sha256 = "sha256-ekpI5GTLbKjlbWH9GSmpp/3URurc7UN+agxMfyGxrVA="; }; propagatedBuildInputs = [ From 17834d17f062e8258ee188f8b1a9bb0e4f2dc577 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Aug 2021 00:01:31 +0200 Subject: [PATCH 213/234] tfsec: 0.58.1 -> 0.58.4 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 19d93e131f6..2ea5ce3090e 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.58.1"; + version = "0.58.4"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oYGfwEXr26RepuwpRQ8hCiqLTpDvz7v9Lit5QY4mT4U="; + sha256 = "sha256-gnipQyjisi1iY1SSmESrwNvxyacq9fsva8IY3W6Gpd8="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From 7344a0e7631f88b5c8a7362d83ca4423e36efe40 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 13 Aug 2021 23:48:03 +0200 Subject: [PATCH 214/234] update.py: fix vim's updater script recent updates to luarocks updater had broken the vim plugin update script --- maintainers/scripts/pluginupdate.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 79f5b93be8a..c468b33bb47 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -86,7 +86,7 @@ class PluginDesc: owner: str repo: str branch: str - alias: str + alias: Optional[str] class Repo: @@ -317,12 +317,10 @@ def get_current_plugins(editor: Editor) -> List[Plugin]: def prefetch_plugin( - user: str, - repo_name: str, - branch: str, - alias: Optional[str], + p: PluginDesc, cache: "Optional[Cache]" = None, ) -> Tuple[Plugin, Dict[str, str]]: + user, repo_name, branch, alias = p.owner, p.repo, p.branch, p.alias log.info(f"Fetching last commit for plugin {user}/{repo_name}@{branch}") repo = Repo(user, repo_name, branch, alias) commit, date = repo.latest_commit() @@ -347,7 +345,7 @@ def prefetch_plugin( def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin: - plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line)) + plugin, _ = prefetch_plugin(parse_plugin_line(plugin_line)) return plugin @@ -466,11 +464,11 @@ class Cache: def prefetch( - args: PluginDesc, cache: Cache + pluginDesc: PluginDesc, cache: Cache ) -> Tuple[str, str, Union[Exception, Plugin], dict]: - owner, repo = args.owner, args.repo + owner, repo = pluginDesc.owner, pluginDesc.repo try: - plugin, redirect = prefetch_plugin(owner, repo, args.branch, args.alias, cache) + plugin, redirect = prefetch_plugin(pluginDesc, cache) cache[plugin.commit] = plugin return (owner, repo, plugin, redirect) except Exception as e: @@ -576,8 +574,9 @@ def update_plugins(editor: Editor, args): if autocommit: commit( nixpkgs_repo, - "{editor.get_drv_name name}: init at {version}".format( - editor=editor.name, name=plugin.normalized_name, version=plugin.version + "{drv_name}: init at {version}".format( + drv_name=editor.get_drv_name(plugin.normalized_name), + version=plugin.version ), [args.outfile, args.input_file], ) From c934bb67717c04a4069182423ad1b200ac40c381 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 13 Aug 2021 15:16:21 -0700 Subject: [PATCH 215/234] nixos/hqplayerd: don't add config to restartTriggers when it doesn't exist Previously when the use didn't set `hqplayer.config`, we would still attempt to reference the config file in the restartTriggers, causing an error. --- nixos/modules/services/audio/hqplayerd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index ed8de390417..d549ac77e0e 100644 --- a/nixos/modules/services/audio/hqplayerd.nix +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -110,7 +110,7 @@ in unitConfig.ConditionPathExists = [ configDir stateDir ]; - restartTriggers = [ config.environment.etc."hqplayer/hqplayerd.xml".source ]; + restartTriggers = optionals (cfg.config != null) [ config.environment.etc."hqplayer/hqplayerd.xml".source ]; preStart = '' cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}" From 0278c7c4a47589284276a0566c37f01027249829 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Aug 2021 00:42:46 +0200 Subject: [PATCH 216/234] python3Packages.systembridge: 2.0.4 -> 2.1.0 --- pkgs/development/python-modules/systembridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/systembridge/default.nix b/pkgs/development/python-modules/systembridge/default.nix index 62dbc118a99..ec35b41182c 100644 --- a/pkgs/development/python-modules/systembridge/default.nix +++ b/pkgs/development/python-modules/systembridge/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "systembridge"; - version = "2.0.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "03scbn6khvw1nj73j8kmvyfrxnqcc0wh3ncck4byby6if1an5dvd"; + sha256 = "sha256-P148xEcvPZMizUyRlVeMfX6rGVNf0Efw2Ekvm5SEvKQ="; }; propagatedBuildInputs = [ From 81c234ea3f957a34c623f9c30e0684bfba5fe704 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Aug 2021 00:46:51 +0200 Subject: [PATCH 217/234] python3Packages.python-gammu: 3.1 -> 3.2.2 --- pkgs/development/python-modules/python-gammu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gammu/default.nix b/pkgs/development/python-modules/python-gammu/default.nix index 1548a138947..f3a3672e653 100644 --- a/pkgs/development/python-modules/python-gammu/default.nix +++ b/pkgs/development/python-modules/python-gammu/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-gammu"; - version = "3.1"; + version = "3.2.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "gammu"; repo = pname; rev = version; - sha256 = "1hw2mfrps6wqfyi40p5mp9r59n1ick6pj4hw5njz0k822pbb33p0"; + sha256 = "sha256-HFI4LBrVf+kBoZfdZrZL1ty9N5DxZ2SOvhiIAFVxqaI="; }; nativeBuildInputs = [ pkg-config ]; From b5de556b3499a2ab8adbb836028248ddb26703ed Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 13 Aug 2021 15:12:21 -0700 Subject: [PATCH 218/234] tabnine: expose binary platform in passthru --- pkgs/development/tools/tabnine/default.nix | 34 ++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index baff8affcbf..8219487f554 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -1,27 +1,23 @@ { stdenv, lib, fetchurl, unzip }: - let - # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` - version = "3.5.37"; - src = - if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchurl - { - url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip"; - sha256 = "sha256-Vxmhl4/bhRDeByGgkdSF8yEY5wI23WzT2iH1OFkEpck="; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl - { - url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip"; - sha256 = "sha256-pttjlx7WWE3nog9L1APp8HN+a4ShhlBj5irHOaPgqHw="; - } - else throw "Not supported on ${stdenv.hostPlatform.system}"; + platform = + if stdenv.hostPlatform.system == "x86_64-linux" then { + name = "x86_64-unknown-linux-musl"; + sha256 = "sha256-pttjlx7WWE3nog9L1APp8HN+a4ShhlBj5irHOaPgqHw="; + } else if stdenv.hostPlatform.system == "x86_64-darwin" then { + name = "x86_64-apple-darwin"; + sha256 = "sha256-Vxmhl4/bhRDeByGgkdSF8yEY5wI23WzT2iH1OFkEpck="; + } else throw "Not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { pname = "tabnine"; + # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` + version = "3.5.37"; - inherit version src; + src = fetchurl { + url = "https://update.tabnine.com/bundles/${version}/${platform.name}/TabNine.zip"; + inherit (platform) sha256; + }; dontBuild = true; @@ -40,6 +36,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.platform = platform.name; + meta = with lib; { homepage = "https://tabnine.com"; description = "Smart Compose for code that uses deep learning to help you write code faster"; From 19440eadf78c3197b80c2e79c234d6edd49ffa1a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 13 Aug 2021 15:13:40 -0700 Subject: [PATCH 219/234] vimPlugins.compe-tabnine: fix binaries symlink --- pkgs/misc/vim-plugins/overrides.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index b2dd6f0f5f0..60f5fdce621 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -126,8 +126,8 @@ self: super: { buildInputs = [ tabnine ]; postFixup = '' - mkdir $target/binaries - ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) + mkdir -p $target/binaries/${tabnine.version} + ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform} ''; }); From 43882cb0c9fbbfc8f4d5ddfea3cf84d6b1a82592 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 14 Aug 2021 07:56:58 +0800 Subject: [PATCH 220/234] taxi: 0.0.1-unstable=2020-09-03 -> 2.0.2 --- pkgs/applications/networking/ftp/taxi/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 8e9966a3f8e..c6015a66963 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -4,6 +4,7 @@ , gobject-introspection , gtk3 , libgee +, libhandy , libsecret , libsoup , meson @@ -18,13 +19,13 @@ stdenv.mkDerivation rec { pname = "taxi"; - version = "0.0.1-unstable=2020-09-03"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; - rev = "74aade67fd9ba9e5bc10c950ccd8d7e48adc2ea1"; - sha256 = "sha256-S/FeKJxIdA30CpfFVrQsALdq7Gy4F4+P50Ky5tmqKvM="; + rev = version; + sha256 = "1a4a14b2d5vqbk56drzbbldp0nngfqhwycpyv8d3svi2nchkvpqa"; }; nativeBuildInputs = [ @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libgee + libhandy libsecret libsoup pantheon.granite From cbd25f78ccac0ca238232a4558275374f819c9bd Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 14 Aug 2021 03:30:32 +0300 Subject: [PATCH 221/234] bazarr: 0.9.6 -> 0.9.7 --- pkgs/servers/bazarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 112e6d2567e..1db21cb13bc 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.6"; + version = "0.9.7"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-ZSQzDlObnv5DEra2+YgXhox583KPyGIjia0SJyTUPWo="; + sha256 = "sha256-OyH3/KK8d5pWu+Ubzgd4N0IwpumbAe/43Oo+LGg+Erc="; }; nativeBuildInputs = [ unzip makeWrapper ]; From 4b818d89d2d6edf7756739d08ce3296c74e3ac22 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Fri, 13 Aug 2021 21:07:01 +0300 Subject: [PATCH 222/234] helix: 0.3.0 -> 0.4.0 --- pkgs/applications/editors/helix/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 315951b0e9e..66c0e092fcb 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -1,20 +1,28 @@ -{ fetchFromGitHub, lib, rustPlatform }: +{ fetchFromGitHub, lib, rustPlatform, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "helix"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "helix-editor"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-dI5yIP5uUmM9pyMpvvdrk8/0jE/REkU/m9BF081LwMU="; + sha256 = "sha256-iCNA+gZer6BycWnhosDFRuxfS6QAb06XTix/vFsaey0="; }; - cargoSha256 = "sha256-l3Ikr4IyUsHItJIC4BaIZZb6vio3bchumbbPI+nxIjQ="; + cargoSha256 = "sha256-sqXPgtLMXa3kMQlnw2xDBEsVfjeRXO6Zp6NEFS/0h20="; - cargoBuildFlags = [ "--features embed_runtime" ]; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + mkdir -p $out/lib + cp -r runtime $out/lib + ''; + postFixup = '' + wrapProgram $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime + ''; meta = with lib; { description = "A post-modern modal text editor"; From 1f0f1f43dc539d3448d781ddea2c92c0ce6c6d0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 04:27:22 +0000 Subject: [PATCH 223/234] xscreensaver: 6.00 -> 6.01 --- pkgs/misc/screensavers/xscreensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 6b90d6f58e1..05ebdde853e 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "6.00"; + version = "6.01"; pname = "xscreensaver"; src = fetchurl { url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "WFCIl0chuCjr1x/T67AZ0b8xITPJVurJZy1h9rSddwY="; + sha256 = "sha256-CFSEZl2R9gtKHe2s2UvPm3Sw+wlrztyJ/xwkUWjlRzs="; }; nativeBuildInputs = [ From 55a77507e465e594b81b0f80c23dfaf7886a20b2 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 14 Aug 2021 10:26:36 +0300 Subject: [PATCH 224/234] evolution-data-server: 3.40.3 -> 3.40.4 --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 480f95b970b..156ffbb1c78 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.40.3"; + version = "3.40.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Trs5F9a+tUrVlt5dilxG8PtXJJ7Z24HwXHqUpzDB2SE="; + sha256 = "h8GF8Yw3Jw42EZgfGb2SIayXTIB0Ysjc6QvqCHEsWAA="; }; patches = [ From b31edcc8695cd4d09d9a33e4cb66de6d63a800ad Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Sat, 14 Aug 2021 07:36:38 +0000 Subject: [PATCH 225/234] exploitdb: 2021-08-11 -> 2021-08-14 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 0e92047c63f..0eba7b465fc 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-08-11"; + version = "2021-08-14"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-OSEG0pWnxSvUS1h9v1j9/poo15ZoouNqiG+qB/JrOHc="; + sha256 = "sha256-7nXcegB0ZuNXIExf6LWqSrjrdD+5ahGJb00O/G6lXmk="; }; installPhase = '' From d09e0be1c4876fe99340b03e56ebb941f93842c2 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sat, 17 Apr 2021 19:02:16 +0200 Subject: [PATCH 226/234] nixpkgs-docs: when to prefer passthru.tests over installCheckPhase And mention you can have either lightweight 'package' or more heavyweight 'NixOS' (module) tests. This was suggested at https://github.com/ryantm/nixpkgs-update/issues/260#issuecomment-821287971 and discussed further at https://github.com/NixOS/nixpkgs/pull/119731 --- .../coding-conventions.chapter.md | 21 +++++++++++++++- doc/stdenv/meta.chapter.md | 25 ++++++++++++++++++- doc/stdenv/stdenv.chapter.md | 2 ++ 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 7199fc63c8d..85c8626bd99 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -545,7 +545,26 @@ The following types of tests exists: Here in the nixpkgs manual we describe mostly _package tests_; for _module tests_ head over to the corresponding [section in the NixOS manual](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). -### Writing package tests {#ssec-package-tests-writing} +### Writing inline package tests {#ssec-inline-package-tests-writing} + +For very simple tests, they can be written inline: + +```nix +{ …, yq-go }: + +buildGoModule rec { + … + + passthru.tests = { + simple = runCommand "${pname}-test" {} '' + echo "test: 1" | ${yq-go}/bin/yq eval -j > $out + [ "$(cat $out | tr -d $'\n ')" = '{"test":1}' ] + ''; + }; +} +``` + +### Writing larger package tests {#ssec-package-tests-writing} This is an example using the `phoronix-test-suite` package with the current best practices. diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index f226a725480..e4970f7e964 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -134,7 +134,28 @@ Attribute Set `lib.platforms` defines [various common lists](https://github.com/ This attribute is special in that it is not actually under the `meta` attribute set but rather under the `passthru` attribute set. This is due to how `meta` attributes work, and the fact that they are supposed to contain only metadata, not derivations. ::: -An attribute set with as values tests. A test is a derivation, which builds successfully when the test passes, and fails to build otherwise. A derivation that is a test needs to have `meta.timeout` defined. +An attribute set with tests as values. A test is a derivation that builds when the test passes and fails to build otherwise. + +You can run these tests with: + +```ShellSession +$ cd path/to/nixpkgs +$ nix-build -A your-package.tests +``` + +#### Package tests + +Tests that are part of the source package are often executed in the `installCheckPhase`. + +Prefer `passthru.tests` for tests that are introduced in nixpkgs because: + +* `passthru.tests` tests the 'real' package, independently from the environment in which it was built +* we can run `passthru.tests` independently +* `installCheckPhase` adds overhead to each build + +For more on how to write and run package tests, see . + +#### NixOS tests The NixOS tests are available as `nixosTests` in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to: @@ -148,6 +169,8 @@ The NixOS tests are available as `nixosTests` in parameters of derivations. For } ``` +NixOS tests run in a VM, so they are slower than regular package tests. For more information see [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). + ### `timeout` {#var-meta-timeout} A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in `nixpkgs`. diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index e3e7b4c850b..9befcaa51a9 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -714,6 +714,8 @@ to `~/.gdbinit`. GDB will then be able to find debug information installed via ` The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default `installCheck` calls `make installcheck`. +It is often better to add tests that are not part of the source distribution to `passthru.tests` (see ). This avoids adding overhead to every build and enables us to run them independently. + #### Variables controlling the installCheck phase {#variables-controlling-the-installcheck-phase} ##### `doInstallCheck` {#var-stdenv-doInstallCheck} From ac6cb9519c742f60545a45e5cd0bb822536a5ca8 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 14 Aug 2021 11:21:30 +0300 Subject: [PATCH 227/234] gnome.gnome-software: 40.3 -> 40.4 --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index c8e637124ae..6d71c579d7e 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "40.3"; + version = "40.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "y39TbLCfWCyQdVyQl08+g9/5U56it8CWibtOCsP/yF8="; + sha256 = "voxhGoAvcXGNzLvUVE7ZaIcxGYRv03t7dqeq1yx5mL8="; }; patches = [ From 94938ee62856317741a9df144138fd8f0a320dc4 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 14 Aug 2021 12:13:08 +0300 Subject: [PATCH 228/234] gnome.gnome-maps: 40.3 -> 40.4 --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 779f1855371..5784fb8d481 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "40.3"; + version = "40.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-p58Fz+u1UMUanGKwgDk2PXDdo90RP+cTR6lCW9cYaIk="; + sha256 = "sha256-LFt+HmX39OVP6G7d2hE46qbAaRoUlAPZXL4i7cgiUJw="; }; doCheck = true; From b346a9ac0519e96f29d0eaf6bd046a86d2da4d33 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 14 Aug 2021 12:21:06 +0300 Subject: [PATCH 229/234] python38Packages.hg-evolve: 10.3.2 -> 10.3.3 --- pkgs/development/python-modules/hg-evolve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index a0229d1e501..00791ac642f 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.3.2"; + version = "10.3.3"; src = fetchPypi { inherit pname version; - sha256 = "ba819732409d39ddd4ff2fc507dc921408bf30535d2d78313637b29eeac98860"; + sha256 = "ca3b0ae45a2c3a811c0dc39153b8a1ea8a5c8f786c56370a41dfd83a5bff2502"; }; checkInputs = [ From 407f4ad6324897e45aaeb4086dcba12baaa2a849 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 10:02:09 +0000 Subject: [PATCH 230/234] wob: 0.11 -> 0.12 --- pkgs/tools/wayland/wob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix index 07fd6f433d7..7f5b7b61c62 100644 --- a/pkgs/tools/wayland/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya"; + sha256 = "sha256-gVQqZbz6ylBBlmhSgyaSEvAyMi48QiuviwZodPVGJxI="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; From dd36a7c487f03d8673bd41bd9fda72d0d8252675 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 14 Aug 2021 12:18:58 +0200 Subject: [PATCH 231/234] chromiumDev: Fix the installation phase --- pkgs/applications/networking/browsers/chromium/browser.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index a86a82fcb5f..26c2909da54 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -16,7 +16,8 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - cp -v "$buildPath/crashpad_handler" "$libExecPath/" + ${lib.optionalString (channel != "dev") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''} + ${lib.optionalString (channel == "dev") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''} cp -v "$buildPath/chrome" "$libExecPath/$packageName" # Swiftshader From 759dd3036f98985be36c41e9b85f6dd63db68c7b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 14 Aug 2021 12:26:18 +0200 Subject: [PATCH 232/234] signal-desktop: 5.13.0 -> 5.13.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index df1ea452351..f5078181ed6 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.13.0"; # Please backport all updates to the stable channel. + version = "5.13.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "10qlavff7q1bdda60q0cia0fzi9y7ysaavrd4y8v0nzbmcz70abr"; + sha256 = "0k3gbs6y19vri5n087wc6fdhydkis3h6rhxd3w1j9rhrb5fxjv3q"; }; nativeBuildInputs = [ From 920d515576fc13294ecf61c8b320d071ff7b3f14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 10:22:39 +0000 Subject: [PATCH 233/234] gnome.yelp: 40.0 -> 40.3 --- pkgs/desktops/gnome/core/yelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index f4df80f5611..746866fc9c2 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "40.0"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-B3dfoGzSg2Xs2Cm7FqhaaCiXqyHYzONFlrvvXNRVquA="; + sha256 = "sha256-oXOEeFHyYYm+eOy7EAFdU52Mzv/Hwj6GNUkrw62l7iM="; }; nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; From d855d4cccc01fcc7e700fcaff5887463c4b2069b Mon Sep 17 00:00:00 2001 From: David Armstrong Lewis Date: Fri, 13 Aug 2021 13:57:08 -0700 Subject: [PATCH 234/234] cargo-watch: fix build on darwin --- pkgs/development/tools/rust/cargo-watch/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index f2d5793f767..46bd0a591a0 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust, libiconv }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, Foundation, rust, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-watch"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Xp/pxPKs41TXO/EUY5x8Bha7NUioMabbb73///fFr6U="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ece72bc0aa..dbfbd62173c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12255,7 +12255,7 @@ with pkgs; }; cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { - inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; }; cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };