From bf185eaa6935c4ab58f079a7a5c3e09ce5a123f9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 10 Jun 2021 14:20:23 -0700 Subject: [PATCH 01/95] nixos-rebuild: add --use-substitutes option --- nixos/doc/manual/man-nixos-rebuild.xml | 16 ++++++++++++++++ .../linux/nixos-rebuild/nixos-rebuild.sh | 12 ++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 2e1069828c1b..a129d31e1edd 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -535,6 +535,22 @@ + + + + + + + When set, nixos-rebuild will add + to each invocation of nix-copy-closure. This will only affect the + behavior of nixos-rebuild if or + is also set. This is useful when + the target-host connection to cache.nixos.org is faster than the + connection between hosts. + + + + diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 5522fa6a4569..033bab8172ee 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -15,6 +15,7 @@ showSyntax() { # Parse the command line. origArgs=("$@") +copyClosureFlags=() extraBuildFlags=() lockFlags=() flakeFlags=() @@ -59,6 +60,9 @@ while [ "$#" -gt 0 ]; do upgrade=1 upgrade_all=1 ;; + -s|--use-substitutes) + copyClosureFlags+=("$i") + ;; --max-jobs|-j|--cores|-I|--builders) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") @@ -156,11 +160,11 @@ targetHostCmd() { copyToTarget() { if ! [ "$targetHost" = "$buildHost" ]; then if [ -z "$targetHost" ]; then - NIX_SSHOPTS=$SSHOPTS nix-copy-closure --from "$buildHost" "$1" + NIX_SSHOPTS=$SSHOPTS nix-copy-closure "${copyClosureFlags[@]}" --from "$buildHost" "$1" elif [ -z "$buildHost" ]; then - NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$targetHost" "$1" + NIX_SSHOPTS=$SSHOPTS nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1" else - buildHostCmd nix-copy-closure --to "$targetHost" "$1" + buildHostCmd nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1" fi fi } @@ -419,7 +423,7 @@ if [[ -n $buildNix && -z $flake ]]; then if [ -a "$nixDrv" ]; then nix-store -r "$nixDrv"'!'"out" --add-root "$tmpDir/nix" --indirect >/dev/null if [ -n "$buildHost" ]; then - nix-copy-closure --to "$buildHost" "$nixDrv" + nix-copy-closure "${copyClosureFlags[@]}" --to "$buildHost" "$nixDrv" # The nix build produces multiple outputs, we add them all to the remote path for p in $(buildHostCmd nix-store -r "$(readlink "$nixDrv")" "${buildArgs[@]}"); do remoteNix="$remoteNix${remoteNix:+:}$p/bin" From 3f0fb761044413e4d4f2c1d3d34e89726860d701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 8 Jun 2021 20:05:57 +0200 Subject: [PATCH 02/95] spotifyd: generate TOML config via formats --- nixos/modules/services/audio/spotifyd.nix | 27 ++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/spotifyd.nix b/nixos/modules/services/audio/spotifyd.nix index 9279a03aed4e..22848ed98000 100644 --- a/nixos/modules/services/audio/spotifyd.nix +++ b/nixos/modules/services/audio/spotifyd.nix @@ -4,7 +4,15 @@ with lib; let cfg = config.services.spotifyd; - spotifydConf = pkgs.writeText "spotifyd.conf" cfg.config; + toml = pkgs.formats.toml {}; + warnConfig = + if cfg.config != "" + then lib.trace "Using the stringly typed .config attribute is discouraged. Use the TOML typed .settings attribute instead." + else id; + spotifydConf = + if cfg.settings != {} + then toml.generate "spotify.conf" cfg.settings + else warnConfig (pkgs.writeText "spotifyd.conf" cfg.config); in { options = { @@ -14,6 +22,16 @@ in config = mkOption { default = ""; type = types.lines; + description = '' + (Deprecated) Configuration for Spotifyd. For syntax and directives, see + . + ''; + }; + + settings = mkOption { + default = {}; + type = toml.type; + example = { global.bitrate = 320; }; description = '' Configuration for Spotifyd. For syntax and directives, see . @@ -23,6 +41,13 @@ in }; config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.config == "" || cfg.settings == {}; + message = "At most one of the .config attribute and the .settings attribute may be set"; + } + ]; + systemd.services.spotifyd = { wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" "sound.target" ]; From 1f8686373abe21bf6b1ce972f0ea55405b449329 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 22 Aug 2021 20:37:42 +0000 Subject: [PATCH 03/95] python3Packages.jaxlib: init at 0.1.70 --- .../python-modules/jaxlib/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/jaxlib/default.nix diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix new file mode 100644 index 000000000000..240c5a7d6d0e --- /dev/null +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -0,0 +1,45 @@ +# For the moment we only support the CPU backend of jaxlib. GPU and TPU backends +# require some additional work. Their wheels are not located on PyPI. +# * CPU/GPU: https://storage.googleapis.com/jax-releases/jax_releases.html +# * TPU: https://storage.googleapis.com/jax-releases/libtpu_releases.html + +{ autoPatchelfHook, buildPythonPackage, fetchPypi, isPy39, lib, stdenv +# propagatedBuildInputs +, absl-py, flatbuffers, scipy +}: + +buildPythonPackage rec { + pname = "jaxlib"; + version = "0.1.70"; + format = "wheel"; + + # At the time of writing (8/19/21), there are releases for 3.7-3.9. Supporting + # all of them is a pain, so we focus on 3.9, the current nixpkgs python3 + # version. + disabled = !isPy39; + + src = fetchPypi { + inherit pname version format; + dist = "cp39"; + python = "cp39"; + platform = "manylinux2010_x86_64"; + sha256 = "sha256-mytMTqoavpuRawj52MU5/iFj27SGlm8DaoQ5vd/3bss="; + }; + + # Prebuilt wheels are dynamically linked against things that nix can't find. + # Run `autoPatchelfHook` to automagically fix them. + nativeBuildInputs = [ autoPatchelfHook ]; + # Dynamic link dependencies + buildInputs = [ stdenv.cc.cc ]; + + # pip dependencies + propagatedBuildInputs = [ absl-py flatbuffers scipy ]; + + meta = with lib; { + description = "XLA library for JAX"; + homepage = "https://github.com/google/jax"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 428913333280..fa17a8a7e7ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3716,6 +3716,8 @@ in { javaproperties = callPackage ../development/python-modules/javaproperties { }; + jaxlib = callPackage ../development/python-modules/jaxlib { }; + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; jc = callPackage ../development/python-modules/jc { }; From 426569a04174720817242de5e8d9157582595055 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 22 Aug 2021 20:39:04 +0000 Subject: [PATCH 04/95] python3Packages.jax: init at 0.2.19 --- .../python-modules/jax/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/jax/default.nix diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix new file mode 100644 index 000000000000..edf18bbe2ed0 --- /dev/null +++ b/pkgs/development/python-modules/jax/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage, fetchFromGitHub, lib +# propagatedBuildInputs +, absl-py, numpy, opt-einsum +# checkInputs +, jaxlib, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jax"; + version = "0.2.19"; + + # Fetching from pypi doesn't allow us to run the test suite. See https://discourse.nixos.org/t/pythonremovetestsdir-hook-being-run-before-checkphase/14612/3. + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "jax-v${version}"; + sha256 = "sha256-pVn62G7pydR7ybkf7gSbu0FlEq2c0US6H2GTBAljup4="; + }; + + # jaxlib is _not_ included in propagatedBuildInputs because there are + # different versions of jaxlib depending on the desired target hardware. The + # JAX project ships separate wheels for CPU, GPU, and TPU. Currently only the + # CPU wheel is packaged. + propagatedBuildInputs = [ absl-py numpy opt-einsum ]; + + checkInputs = [ jaxlib pytestCheckHook ]; + # NOTE: Don't run the tests in the expiremental directory as they require flax + # which creates a circular dependency. See https://discourse.nixos.org/t/how-to-nix-ify-python-packages-with-circular-dependencies/14648/2. + # Not a big deal, this is how the JAX docs suggest running the test suite + # anyhow. + pytestFlagsArray = [ "-W ignore::DeprecationWarning" "tests/" ]; + + meta = with lib; { + description = "Differentiate, compile, and transform Numpy code."; + homepage = "https://github.com/google/jax"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa17a8a7e7ee..c844eea23dce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3716,6 +3716,8 @@ in { javaproperties = callPackage ../development/python-modules/javaproperties { }; + jax = callPackage ../development/python-modules/jax { }; + jaxlib = callPackage ../development/python-modules/jaxlib { }; JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; From a16117f1c042d4772d750077fa3c21421cf4a199 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 22 Aug 2021 20:56:30 +0000 Subject: [PATCH 05/95] maintainer-list.nix: add samuela --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 37711fe0fa1e..9192c390d27b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9542,6 +9542,12 @@ githubId = 115821; name = "Sam Rose"; }; + samuela = { + email = "skainsworth@gmail.com"; + github = "samuela"; + githubId = 226872; + name = "Samuel Ainsworth"; + }; samueldr = { email = "samuel@dionne-riel.com"; github = "samueldr"; From 212cfed17cd2016d3d6872c34547b88e475f3eae Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Wed, 25 Aug 2021 15:17:48 +0200 Subject: [PATCH 06/95] lgogdownloader: add myself as maintainer --- pkgs/games/lgogdownloader/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index d92484cfef27..fba3af2b2736 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; homepage = "https://github.com/Sude-/lgogdownloader"; license = licenses.wtfpl; + maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; }; } From bb877fadee32ab31d944e1a2e87827d6fd04a81d Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 27 Aug 2021 01:37:58 +0200 Subject: [PATCH 07/95] lgogdownloader: add installCheck --- pkgs/games/lgogdownloader/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index fba3af2b2736..446d2ac86480 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -27,6 +27,16 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl htmlcxx jsoncpp liboauth rhash tinyxml-2 ]; + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" --version)" == "LGOGDownloader ${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; + meta = with lib; { description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; homepage = "https://github.com/Sude-/lgogdownloader"; From 43270a5081c0fddb5a898a1b4661d3c2561da991 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 27 Aug 2021 01:42:04 +0200 Subject: [PATCH 08/95] lgogdownloader: formatting --- pkgs/games/lgogdownloader/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index 446d2ac86480..93f17dbb8135 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , pkg-config @@ -23,9 +24,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-LywFJCZevlhthOkAZo7JkXcPT9V6Zh28VD/MVQnMQjo="; }; - nativeBuildInputs = [ cmake pkg-config help2man ]; + nativeBuildInputs = [ + cmake + pkg-config + help2man + ]; - buildInputs = [ boost curl htmlcxx jsoncpp liboauth rhash tinyxml-2 ]; + buildInputs = [ + boost + curl + htmlcxx + jsoncpp + liboauth + rhash + tinyxml-2 + ]; doInstallCheck = true; installCheckPhase = '' From 2eabda6f39b79f6de759616a74544c28ee3d6d49 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 30 Aug 2021 17:41:39 +0200 Subject: [PATCH 09/95] dasel: 1.19.0 -> 1.20.0 --- pkgs/applications/misc/dasel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 96042c99b283..ba2e8819517a 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hV8+j66Z8cs6K1TElM+3ar2C8tSqJJBvBYoU+OWcqcU="; + sha256 = "sha256-SJWIjizPf0bRwanpnLpuqsWKjaCwc1wBV2sCPSqGiOs="; }; - vendorSha256 = "sha256-fRG70f2SZr8BOmF+MNLEdJmK1308h+HY4N0kkTpvuPc="; + vendorSha256 = "sha256-u3KsMi63wOi1fCSLpGxATZNmbhoIAGeVpwcKh+nmi3k="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" From fb1b0dc6cd1e2b4357c79983e12d62619cb4789b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Sep 2021 04:20:00 +0000 Subject: [PATCH 10/95] shen-sources: 22.3 -> 22.4 --- .../interpreters/shen-sources/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/development/interpreters/shen-sources/default.nix index 84839cf42dee..99e72fbea112 100644 --- a/pkgs/development/interpreters/shen-sources/default.nix +++ b/pkgs/development/interpreters/shen-sources/default.nix @@ -1,26 +1,28 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl }: stdenv.mkDerivation rec { - name = "shen-sources-${version}"; - version = "22.3"; + pname = "shen-sources"; + version = "22.4"; src = fetchurl { url = "https://github.com/Shen-Language/shen-sources/releases/download/shen-${version}/ShenOSKernel-${version}.tar.gz"; - sha256 = "16jaliga3bia0f8c8ja1y22wanbnbriv31qfqdc87a4p4dx9c77q"; + sha256 = "1wlyh4rbzr615iykq1s779jvq28812rb4dascx1kzpakhw8z0260"; }; - buildInputs = []; - buildPhase = ""; + dontBuild = true; + installPhase = '' mkdir -p $out cp . $out -R ''; meta = with lib; { - homepage = https://shenlanguage.org; + homepage = "https://shenlanguage.org"; description = "Source code for the Shen Language"; + changelog = "https://github.com/Shen-Language/shen-sources/raw/shen-${version}/CHANGELOG.md"; platforms = platforms.all; maintainers = with maintainers; [ bsima ]; license = licenses.bsd3; From 4f7808842d194477d865393c705970a3bf4279f5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Sep 2021 04:20:00 +0000 Subject: [PATCH 11/95] shen-sbcl: rewrite Move sbcl to nativeBuildInputs and separate the check phase correctly. --- .../interpreters/shen-sbcl/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix index f93e0ae5d958..194c67eba98f 100644 --- a/pkgs/development/interpreters/shen-sbcl/default.nix +++ b/pkgs/development/interpreters/shen-sbcl/default.nix @@ -1,30 +1,39 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , shen-sources , sbcl }: stdenv.mkDerivation rec { - name = "shen-sbcl-${version}"; + pname = "shen-sbcl"; version = "3.0.3"; + src = fetchurl { url = "https://github.com/Shen-Language/shen-cl/releases/download/v${version}/shen-cl-v${version}-sources.tar.gz"; sha256 = "0mc10jlrxqi337m6ngwbr547zi4qgk69g1flz5dsddjy5x41j0yz"; }; - buildInputs = [ - sbcl shen-sources - ]; - buildPhase = '' + + nativeBuildInputs = [ sbcl ]; + + preBuild = '' ln -s ${shen-sources} kernel - make sbcl ''; + + buildFlags = [ "build-sbcl" ]; + + checkTarget = "test-sbcl"; + + doCheck = true; + installPhase = '' - mkdir -p $out install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl ''; + meta = with lib; { - homepage = https://shenlanguage.org; + homepage = "https://shenlanguage.org"; description = "Port of Shen running on Steel Bank Common Lisp"; + changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md"; platforms = sbcl.meta.platforms; maintainers = with maintainers; [ bsima ]; license = licenses.bsd3; From 6f44416cf2655b87378d3752eda00dfccb39dea6 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Wed, 1 Sep 2021 21:04:02 +0000 Subject: [PATCH 12/95] python3Packages.jax: remove meta.description period --- pkgs/development/python-modules/jax/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index edf18bbe2ed0..f0b4d6e26324 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-W ignore::DeprecationWarning" "tests/" ]; meta = with lib; { - description = "Differentiate, compile, and transform Numpy code."; + description = "Differentiate, compile, and transform Numpy code"; homepage = "https://github.com/google/jax"; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; From 0ff986154ea140f256e47a78233579ad27d8387a Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sat, 4 Sep 2021 05:47:09 +0000 Subject: [PATCH 13/95] python3Packages.jaxlib: add CUDA support --- .../python-modules/jaxlib/default.nix | 66 ++++++++++++++----- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 240c5a7d6d0e..039c3deb8fc8 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -1,16 +1,28 @@ -# For the moment we only support the CPU backend of jaxlib. GPU and TPU backends -# require some additional work. Their wheels are not located on PyPI. -# * CPU/GPU: https://storage.googleapis.com/jax-releases/jax_releases.html -# * TPU: https://storage.googleapis.com/jax-releases/libtpu_releases.html +# For the moment we only support the CPU and GPU backends of jaxlib. The TPU +# backend will require some additional work. Those wheels are located here: +# https://storage.googleapis.com/jax-releases/libtpu_releases.html. -{ autoPatchelfHook, buildPythonPackage, fetchPypi, isPy39, lib, stdenv +# For future reference, the easiest way to test that the gpu is being used is: +# NIX_PATH=.. nix-shell -p python3 python3Packages.jax "python3Packages.jaxlib.override { cudaSupport = true; }" +# python -c "from jax.lib import xla_bridge; print(xla_bridge.get_backend().platform)" +# See https://github.com/google/jax/issues/971#issuecomment-508216439. + +{ addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config, fetchPypi +, fetchurl, isPy39, lib, stdenv # propagatedBuildInputs -, absl-py, flatbuffers, scipy +, absl-py, flatbuffers, scipy, cudatoolkit_11 +# Options: +, cudaSupport ? config.cudaSupport or false }: +assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1"; + +let + device = if cudaSupport then "gpu" else "cpu"; +in buildPythonPackage rec { pname = "jaxlib"; - version = "0.1.70"; + version = "0.1.71"; format = "wheel"; # At the time of writing (8/19/21), there are releases for 3.7-3.9. Supporting @@ -18,23 +30,47 @@ buildPythonPackage rec { # version. disabled = !isPy39; - src = fetchPypi { - inherit pname version format; - dist = "cp39"; - python = "cp39"; - platform = "manylinux2010_x86_64"; - sha256 = "sha256-mytMTqoavpuRawj52MU5/iFj27SGlm8DaoQ5vd/3bss="; - }; + src = { + cpu = fetchurl { + url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl"; + sha256 = "sha256:0rqhs6qabydizlv5d3rb20dbv6612rr7dqfniy9r6h4kazdinsn6"; + }; + gpu = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda111/jaxlib-${version}+cuda111-cp39-none-manylinux2010_x86_64.whl"; + sha256 = "sha256:065kyzjsk9m84d138p99iymdiiicm1qz8a3iwxz8rspl43rwrw89"; + }; + }.${device}; # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook ] ++ lib.optional cudaSupport addOpenGLRunpath; # Dynamic link dependencies buildInputs = [ stdenv.cc.cc ]; + # jaxlib contains shared libraries that open other shared libraries via dlopen + # and these implicit dependencies are not recognized by ldd or + # autoPatchelfHook. That means we need to sneak them into rpath. This step + # must be done after autoPatchelfHook and the automatic stripping of + # artifacts. autoPatchelfHook runs in postFixup and auto-stripping runs in the + # patchPhase. Dependencies: + # * libcudart.so.11.0 -> cudatoolkit_11.lib + # * libcuda.so.1 -> opengl driver in /run/opengl-driver/lib + preInstallCheck = lib.optional cudaSupport '' + shopt -s globstar + + addOpenGLRunpath $out/**/*.so + + for file in $out/**/*.so; do + rpath=$(patchelf --print-rpath $file) + patchelf --set-rpath "$rpath:${lib.makeLibraryPath [ cudatoolkit_11.lib ]}" $file + done + ''; + # pip dependencies propagatedBuildInputs = [ absl-py flatbuffers scipy ]; + pythonImportsCheck = [ "jaxlib" ]; + meta = with lib; { description = "XLA library for JAX"; homepage = "https://github.com/google/jax"; From 3ea5dbdd720abec9a48665a69e69e5486bfe0fa0 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sat, 4 Sep 2021 20:57:32 +0000 Subject: [PATCH 14/95] python3Packages.jaxlib: add cudatoolkit_11 in propagatedBuildInputs --- pkgs/development/python-modules/jaxlib/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 039c3deb8fc8..af0755bf9dd0 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -2,10 +2,13 @@ # backend will require some additional work. Those wheels are located here: # https://storage.googleapis.com/jax-releases/libtpu_releases.html. -# For future reference, the easiest way to test that the gpu is being used is: +# For future reference, the easiest way to test the GPU backend is to run # NIX_PATH=.. nix-shell -p python3 python3Packages.jax "python3Packages.jaxlib.override { cudaSupport = true; }" -# python -c "from jax.lib import xla_bridge; print(xla_bridge.get_backend().platform)" -# See https://github.com/google/jax/issues/971#issuecomment-508216439. +# python -c "from jax.lib import xla_bridge; assert xla_bridge.get_backend().platform == 'gpu'" +# python -c "from jax import random; random.PRNGKey(0)" +# See https://github.com/google/jax/issues/971#issuecomment-508216439. There's +# no convenient way to test the GPU backend in the derivation since the nix +# build environment blocks access to the GPU. { addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config, fetchPypi , fetchurl, isPy39, lib, stdenv @@ -66,8 +69,8 @@ buildPythonPackage rec { done ''; - # pip dependencies - propagatedBuildInputs = [ absl-py flatbuffers scipy ]; + # pip dependencies and optionally cudatoolkit. + propagatedBuildInputs = [ absl-py flatbuffers scipy ] ++ lib.optional cudaSupport cudatoolkit_11; pythonImportsCheck = [ "jaxlib" ]; From 8f06bd48f26af655d9c112b27eb3d22a874685c4 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sat, 4 Sep 2021 21:41:40 +0000 Subject: [PATCH 15/95] python3Packages.jaxlib: add cudatoolkit_11 to rpaths --- pkgs/development/python-modules/jaxlib/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index af0755bf9dd0..7761c0372994 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -4,11 +4,14 @@ # For future reference, the easiest way to test the GPU backend is to run # NIX_PATH=.. nix-shell -p python3 python3Packages.jax "python3Packages.jaxlib.override { cudaSupport = true; }" +# export XLA_FLAGS=--xla_gpu_force_compilation_parallelism=1 # python -c "from jax.lib import xla_bridge; assert xla_bridge.get_backend().platform == 'gpu'" # python -c "from jax import random; random.PRNGKey(0)" -# See https://github.com/google/jax/issues/971#issuecomment-508216439. There's -# no convenient way to test the GPU backend in the derivation since the nix -# build environment blocks access to the GPU. +# python -c "from jax import random; x = random.normal(random.PRNGKey(0), (100, 100)); x @ x" +# There's no convenient way to test the GPU backend in the derivation since the +# nix build environment blocks access to the GPU. See also: +# * https://github.com/google/jax/issues/971#issuecomment-508216439 +# * https://github.com/google/jax/issues/5723#issuecomment-913038780 { addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config, fetchPypi , fetchurl, isPy39, lib, stdenv @@ -57,6 +60,7 @@ buildPythonPackage rec { # artifacts. autoPatchelfHook runs in postFixup and auto-stripping runs in the # patchPhase. Dependencies: # * libcudart.so.11.0 -> cudatoolkit_11.lib + # * libcublas.so.11 -> cudatoolkit_11 # * libcuda.so.1 -> opengl driver in /run/opengl-driver/lib preInstallCheck = lib.optional cudaSupport '' shopt -s globstar @@ -65,7 +69,9 @@ buildPythonPackage rec { for file in $out/**/*.so; do rpath=$(patchelf --print-rpath $file) - patchelf --set-rpath "$rpath:${lib.makeLibraryPath [ cudatoolkit_11.lib ]}" $file + # For some reason `makeLibraryPath` on `cudatoolkit_11` maps to + # /lib which is different from /lib. + patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib ]}" $file done ''; From eefaf9052053977856d95d916fa6f82379226e4f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 6 Sep 2021 08:29:29 +0300 Subject: [PATCH 16/95] mailspring: 1.9.1 -> 1.9.2 --- .../networking/mailreaders/mailspring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 8fe93fb1a44a..d2e5beb17180 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "mfpwDYRpFULD9Th8tI5yqb5RYWZJHarbWYpfKS3Q6mE="; + sha256 = "sha256-o7w2XHd5FnPYt9j8IIGy6OgKtdeNb/qZ+EiXGEn0NUQ="; }; nativeBuildInputs = [ From 14cd4bb1dd6c860f47457b295957915641cf7da0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Sep 2021 12:25:15 +0200 Subject: [PATCH 17/95] python3Packages.envoy-utils: init at 0.0.1 --- .../python-modules/envoy-utils/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/envoy-utils/default.nix diff --git a/pkgs/development/python-modules/envoy-utils/default.nix b/pkgs/development/python-modules/envoy-utils/default.nix new file mode 100644 index 000000000000..6f04704a8b5f --- /dev/null +++ b/pkgs/development/python-modules/envoy-utils/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, zeroconf +}: + +buildPythonPackage rec { + pname = "envoy-utils"; + version = "0.0.1"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "envoy_utils"; + inherit version; + sha256 = "13zn0d6k2a4nls9vp8cs0w07bgg4138vz18cadjadhm8p6r3bi0c"; + }; + + propagatedBuildInputs = [ + zeroconf + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "envoy_utils" ]; + + meta = with lib; { + description = "Python utilities for the Enphase Envoy"; + homepage = "https://pypi.org/project/envoy-utils/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7bf364e8bf9..962f7645eddb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2366,6 +2366,8 @@ in { envoy-reader = callPackage ../development/python-modules/envoy-reader { }; + envoy-utils = callPackage ../development/python-modules/envoy-utils { }; + enzyme = callPackage ../development/python-modules/enzyme { }; epc = callPackage ../development/python-modules/epc { }; From 51170e3cb823a804a67e9407a0db1cacbb9d3e99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Sep 2021 12:29:32 +0200 Subject: [PATCH 18/95] python3Packages.envoy-reader: 0.19.0 -> 0.20.0 --- .../python-modules/envoy-reader/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix index d72db523a21c..0f2ca79d6411 100644 --- a/pkgs/development/python-modules/envoy-reader/default.nix +++ b/pkgs/development/python-modules/envoy-reader/default.nix @@ -1,30 +1,27 @@ { lib , buildPythonPackage +, envoy-utils , fetchFromGitHub , httpx , pytest-asyncio , pytest-raises -, pytest-runner , pytestCheckHook , respx }: buildPythonPackage rec { pname = "envoy-reader"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "jesserizzo"; repo = "envoy_reader"; rev = version; - sha256 = "0jyrgm7dc6k66c94gadc69a6xsv2b48wn3b3rbpwgbssi5s7iiz6"; + sha256 = "sha256-nPB1Fvb1qwLHeFkXP2jXixD2ZGA09MtS1qXRhYGt0fM="; }; - nativeBuildInputs = [ - pytest-runner - ]; - propagatedBuildInputs = [ + envoy-utils httpx ]; @@ -35,6 +32,11 @@ buildPythonPackage rec { respx ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner>=5.2" "" + ''; + pythonImportsCheck = [ "envoy_reader" ]; meta = with lib; { From f77daccd528ddc8db479a744b7588fa2da39fb96 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 6 Sep 2021 21:26:56 -0700 Subject: [PATCH 19/95] libnvidia-container: 1.3.3 -> 1.5.0 --- .../virtualization/libnvidia-container/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index dd16fb4d25a7..c7743bf44fc0 100644 --- a/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.3.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "v${version}"; - sha256 = "0rr6ngkzqgw250nilv36fz7fhsqxcgl4nhld2hnr0sr4ngirqcjp"; + sha256 = "sha256-b9yQ1mEo1EkjXMguV0t98OvFEQO4h76EVu154MsB2II="; }; patches = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i \ - -e 's/^REVISION :=.*/REVISION = ${src.rev}/' \ + -e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \ -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \ mk/common.mk From 0f7d54ab97781cf41c001e4a9bb73d841583b464 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 6 Sep 2021 21:27:18 -0700 Subject: [PATCH 20/95] nvidia-container-runtime: 3.4.0 -> 3.5.0 --- .../virtualization/nvidia-container-runtime/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix index 43eb1639b43e..71621d6cd942 100644 --- a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix @@ -25,21 +25,20 @@ let in buildGoPackage rec { pname = "nvidia-container-runtime"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "v${version}"; - sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr"; + sha256 = "sha256-+LZjsN/tKqsPJamoI8xo9LFv14c3e9vVlSP4NJhElcs="; }; - goPackagePath = "github.com/${pname}/src"; + goPackagePath = "github.com/nvidia/nvidia-container-runtime"; ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - mv $out/bin/{src,nvidia-container-runtime} mkdir -p $out/etc/nvidia-container-runtime # nvidia-container-runtime invokes docker-runc or runc if that isn't From a583c3ddad44456cd778c5fec762c6286f98cd30 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 6 Sep 2021 21:27:31 -0700 Subject: [PATCH 21/95] nvidia-container-toolkit: 1.3.0 -> 1.5.0 --- .../virtualization/nvidia-container-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index 8cb470d2fa4c..febd5e4cb1a8 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "nvidia-container-toolkit"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "v${version}"; - sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn"; + sha256 = "sha256-YvwqnwYOrlSE6PmNNZ5xjEaEcXdHKcakIwua+tOvIJ0="; }; vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; From 0d1e42786e6bc5249248e50793f9f8537aaad857 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 7 Sep 2021 15:52:29 +0200 Subject: [PATCH 22/95] github-runner: make derivation easier to override --- .../github-runner/default.nix | 97 +++++++++---------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index e2d40630905c..459b68fa6b2b 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -19,9 +19,6 @@ , zlib }: let - pname = "github-actions-runner"; - version = "2.279.0"; - deps = (import ./deps.nix { inherit fetchurl; }); nugetPackages = map (x: { @@ -29,57 +26,14 @@ let path = "${x}"; }) deps; - nugetSource = linkFarm "${pname}-${version}-packages" nugetPackages; + nugetSource = linkFarm "nuget-packages" nugetPackages; dotnetSdk = dotnetCorePackages.sdk_3_1; runtimeId = "linux-x64"; - - disabledTest = [ - # Self-updating is patched out, hence this test will fail - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" - ] ++ map - # Online tests - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") - [ - "CompositeActionWithActionfile_CompositeContainerNested" - "CompositeActionWithActionfile_CompositePrestepNested" - "CompositeActionWithActionfile_MaxLimit" - "CompositeActionWithActionfile_Node" - "DownloadActionFromGraph" - "DownloadActionFromGraph_Legacy" - "NotPullOrBuildImagesMultipleTimes" - "NotPullOrBuildImagesMultipleTimes_Legacy" - "RepositoryActionWithActionYamlFile_DockerHubImage" - "RepositoryActionWithActionYamlFile_DockerHubImage_Legacy" - "RepositoryActionWithActionfileAndDockerfile" - "RepositoryActionWithActionfileAndDockerfile_Legacy" - "RepositoryActionWithActionfile_DockerHubImage" - "RepositoryActionWithActionfile_DockerHubImage_Legacy" - "RepositoryActionWithActionfile_Dockerfile" - "RepositoryActionWithActionfile_Dockerfile_Legacy" - "RepositoryActionWithActionfile_DockerfileRelativePath" - "RepositoryActionWithActionfile_DockerfileRelativePath_Legacy" - "RepositoryActionWithActionfile_Node" - "RepositoryActionWithActionfile_Node_Legacy" - "RepositoryActionWithDockerfile" - "RepositoryActionWithDockerfile_Legacy" - "RepositoryActionWithDockerfileInRelativePath" - "RepositoryActionWithDockerfileInRelativePath_Legacy" - "RepositoryActionWithDockerfilePrepareActions_Repository" - "RepositoryActionWithInvalidWrapperActionfile_Node" - "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy" - "RepositoryActionWithWrapperActionfile_PreSteps" - "RepositoryActionWithWrapperActionfile_PreSteps_Legacy" - ] ++ map - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") - [ - "EnsureDotnetsdkBashDownloadScriptUpToDate" - "EnsureDotnetsdkPowershellDownloadScriptUpToDate" - ]; - testFilterXml = lib.concatStringsSep "&" disabledTest; in stdenv.mkDerivation rec { - inherit pname version; + pname = "github-runner"; + version = "2.279.0"; src = fetchFromGitHub { owner = "actions"; @@ -125,7 +79,7 @@ stdenv.mkDerivation rec { # Disable specific tests substituteInPlace src/dir.proj \ --replace 'dotnet test Test/Test.csproj' \ - "dotnet test Test/Test.csproj --filter '${testFilterXml}'" + "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" disabledTests}'" # We don't use a Git checkout substituteInPlace src/dir.proj \ @@ -180,6 +134,49 @@ stdenv.mkDerivation rec { doCheck = true; + disabledTests = [ + # Self-updating is patched out, hence this test will fail + "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" + ] ++ map + # Online tests + (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") + [ + "CompositeActionWithActionfile_CompositeContainerNested" + "CompositeActionWithActionfile_CompositePrestepNested" + "CompositeActionWithActionfile_MaxLimit" + "CompositeActionWithActionfile_Node" + "DownloadActionFromGraph" + "DownloadActionFromGraph_Legacy" + "NotPullOrBuildImagesMultipleTimes" + "NotPullOrBuildImagesMultipleTimes_Legacy" + "RepositoryActionWithActionYamlFile_DockerHubImage" + "RepositoryActionWithActionYamlFile_DockerHubImage_Legacy" + "RepositoryActionWithActionfileAndDockerfile" + "RepositoryActionWithActionfileAndDockerfile_Legacy" + "RepositoryActionWithActionfile_DockerHubImage" + "RepositoryActionWithActionfile_DockerHubImage_Legacy" + "RepositoryActionWithActionfile_Dockerfile" + "RepositoryActionWithActionfile_Dockerfile_Legacy" + "RepositoryActionWithActionfile_DockerfileRelativePath" + "RepositoryActionWithActionfile_DockerfileRelativePath_Legacy" + "RepositoryActionWithActionfile_Node" + "RepositoryActionWithActionfile_Node_Legacy" + "RepositoryActionWithDockerfile" + "RepositoryActionWithDockerfile_Legacy" + "RepositoryActionWithDockerfileInRelativePath" + "RepositoryActionWithDockerfileInRelativePath_Legacy" + "RepositoryActionWithDockerfilePrepareActions_Repository" + "RepositoryActionWithInvalidWrapperActionfile_Node" + "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy" + "RepositoryActionWithWrapperActionfile_PreSteps" + "RepositoryActionWithWrapperActionfile_PreSteps_Legacy" + ] ++ map + (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") + [ + "EnsureDotnetsdkBashDownloadScriptUpToDate" + "EnsureDotnetsdkPowershellDownloadScriptUpToDate" + ]; + checkInputs = [ git ]; checkPhase = '' From ebcf2468ac67b473821946a6d5539c001861b465 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 7 Sep 2021 16:03:38 +0200 Subject: [PATCH 23/95] github-runner: 2.279.0 -> 2.281.1 --- .../tools/continuous-integration/github-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 459b68fa6b2b..3cfd7d6015a0 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.279.0"; + version = "2.281.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; - rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version} - sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms="; + rev = "c8caf59bb7adaa87c4cf8f61372670d338a13f2d"; # v${version} + sha256 = "sha256-Nl1FSjwweVqdQEVhqt4PEcqZbF7htNT279yx1nGuAe0="; }; nativeBuildInputs = [ From 1614fc6eb63d012b704cbb34b9c53c823d51c32c Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 7 Sep 2021 16:16:29 +0200 Subject: [PATCH 24/95] github-runner: adapt to latest lttng-ust ref: ab2501bd171f2c930ebd3f3bf6b6a1a228477a08 --- .../tools/continuous-integration/github-runner/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 3cfd7d6015a0..b7da1970da2b 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -237,6 +237,10 @@ stdenv.mkDerivation rec { # Stripping breaks the binaries dontStrip = true; + preFixup = '' + patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so + ''; + postFixup = '' fix_rpath() { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1 From c9c16335d3fce0a1edc8e9fb6a9cb192e1663dfd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 7 Sep 2021 21:01:48 +0200 Subject: [PATCH 25/95] libplacebo: 3.120.3 -> 4.157.0 --- pkgs/development/libraries/libplacebo/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index a7da64f787a3..099bac9274b2 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "3.120.3"; + version = "4.157.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "02hiyhnjdz3zqnzks9bi7my62a85k9k9vfgmh9fy19snsbkd6l80"; + sha256 = "08kqsd29h8wm0vz7698wh2mdgpwv6anqc5n7d1spnnamwyfwc64h"; }; nativeBuildInputs = [ @@ -46,7 +46,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" - "-Ddemos=false" + "-Ddemos=false" # Don't build and install the demo programs + "-Dd3d11=disabled" # Disable the Direct3D 11 based renderer ]; meta = with lib; { From 7df8ba4012d0be57d8a4397ac4b1dd6f818e7023 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 8 Sep 2021 05:26:05 +0300 Subject: [PATCH 26/95] ulauncher: patchShebangs and do not double wrap --- pkgs/applications/misc/ulauncher/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index f9bf70b661ce..0b7a766ba39d 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -77,6 +77,9 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py --subst-var out + patchShebangs bin/ulauncher-toggle + substituteInPlace bin/ulauncher-toggle \ + --replace wmctrl ${wmctrl}/bin/wmctrl ''; # https://github.com/Ulauncher/Ulauncher/issues/390 @@ -99,8 +102,10 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; + # do not double wrap + dontWrapGApps = true; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ wmctrl ]}") + makeWrapperArgs+=("''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}") ''; passthru = { From e2c8dbe58cca3ce8d6c0131d411301030304eba7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 8 Sep 2021 02:45:30 +0000 Subject: [PATCH 27/95] certbot: 1.18.0 -> 1.19.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 48ac17f66d67..e5b6b6cc1cd7 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.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-j+MygstaOt3TMz8rEZE5OBYVZXWtrUyIuSO+qagKrjk="; + sha256 = "sha256-tCszN+sy4Z6nOwULj9ra5/TtW4YYi32fkbMKub5i2Xk="; }; sourceRoot = "source/${pname}"; From 2e0d1231584451741f62fe810a8385040cfc6a9f Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 7 Sep 2021 22:51:03 -0500 Subject: [PATCH 28/95] swi-prolog: set meta.mainProgram --- pkgs/development/compilers/swi-prolog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index cb4cf580a0e9..f10bdb384b63 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { homepage = "https://www.swi-prolog.org"; description = "A Prolog compiler and interpreter"; license = lib.licenses.bsd2; - + mainProgram = "swipl"; platforms = lib.platforms.linux ++ lib.optionals (!withGui) lib.platforms.darwin; maintainers = [ lib.maintainers.meditans ]; }; From c1fe21db9029c7bfce4be3c14b726220f72a3f1a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 7 Sep 2021 23:09:12 -0500 Subject: [PATCH 29/95] swi-prolog: 8.3.9 -> 8.3.29 --- pkgs/development/compilers/swi-prolog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index f10bdb384b63..d53d1426a94b 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -34,7 +34,7 @@ }: let - version = "8.3.9"; + version = "8.3.29"; packInstall = swiplPath: pack: ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." ''; @@ -47,7 +47,7 @@ stdenv.mkDerivation { owner = "SWI-Prolog"; repo = "swipl-devel"; rev = "V${version}"; - sha256 = "0ixb8pc5s7q8q0njs8is1clpvik6jhhdcwnys7m9rpwdzgi10sjz"; + sha256 = "sha256-2QYY3VDG3dhbv5gtSid4eMYMxhhpggCedJL+RhtbbaU="; fetchSubmodules = true; }; From c9507977b0f1197b351c15ec35f5fe9e40e3916e Mon Sep 17 00:00:00 2001 From: toastal Date: Wed, 8 Sep 2021 11:32:00 +0700 Subject: [PATCH 30/95] julia-mono: 0.041 -> 0.042 https://github.com/cormullion/juliamono/releases/tag/v0.042 --- pkgs/data/fonts/julia-mono/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 88f9683e34f2..5e1cd786534d 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "0.041"; + version = "0.042"; in fetchzip { name = "JuliaMono-ttf-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-OjguPR2MFjbY72/PF0R43/g6i95uAPVPbXk+HS0B360="; + sha256 = "sha256-oXODkeLDT5GXO4+r1fGaRrRS/SSBhzro5XE0GOwl4mQ="; postFetch = '' mkdir -p $out/share/fonts/truetype @@ -25,7 +25,7 @@ fetchzip { ''; maintainers = with maintainers; [ suhr ]; platforms = with platforms; all; - homepage = "https://cormullion.github.io/pages/2020-07-26-JuliaMono/"; + homepage = "https://juliamono.netlify.app/"; license = licenses.ofl; }; } From c2073fcb1a41f2ceb2d8bdbbb2132609eed70ead Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 8 Sep 2021 15:20:34 +1000 Subject: [PATCH 31/95] singularity: 3.8.2 -> 3.8.3 --- pkgs/applications/virtualization/singularity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 0e83a113e5db..37fad321cada 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-mWYR3sQCtNNyuLlFbdnsHLQ3EtCFAuRV84UhvRmYVtM="; + sha256 = "sha256-LiLrnuG3P91RuHgxSfDk2DwNLYoMHt9gNBV9UO7vuDU="; }; goPackagePath = "github.com/sylabs/singularity"; From 14ffc3e3bef925374ccfdf43e68eb0f8eefe532f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Sep 2021 08:47:40 +0200 Subject: [PATCH 32/95] python3Packages.youless-api: 0.12 -> 0.13 --- pkgs/development/python-modules/youless-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index bce08bddf2b9..805f99c02288 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "youless-api"; - version = "0.12"; + version = "0.13"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jongsoftdev"; repo = "youless-python-bridge"; rev = version; - sha256 = "18hymahpblq87i7lv479sizj8mgxawjhj31g4j1lyna1mds3887k"; + sha256 = "sha256-Vywzd8wZG4eI/U69fPYuLpF54zAeuCv3Q81z5UcMGjc="; }; propagatedBuildInputs = [ From 36a77bbe7e0ec366ea8dd513f13a2339a2a18129 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Wed, 8 Sep 2021 17:10:19 +1000 Subject: [PATCH 33/95] fluentd: remove fluent-plugin-scribe --- .../ruby-modules/gem-config/default.nix | 7 ------- pkgs/tools/misc/fluentd/Gemfile | 1 - pkgs/tools/misc/fluentd/Gemfile.lock | 5 ----- pkgs/tools/misc/fluentd/gemset.nix | 21 ------------------- 4 files changed, 34 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 8111f6e53cdf..d06b362e2ce4 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -623,13 +623,6 @@ in buildInputs = [ taglib ]; }; - thrift = attrs: { - # See: https://stackoverflow.com/questions/36378190/cant-install-thrift-gem-on-os-x-el-capitan/36523125#36523125 - # Note that thrift-0.8.0 is a dependency of fluent-plugin-scribe which is a dependency of fluentd. - buildFlags = lib.optional (stdenv.isDarwin && lib.versionOlder attrs.version "0.9.2.0") - "--with-cppflags=\"-D_FORTIFY_SOURCE=0 -Wno-macro-redefined -Wno-shift-negative-value\""; - }; - timfel-krb5-auth = attrs: { buildInputs = [ libkrb5 ]; }; diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/tools/misc/fluentd/Gemfile index 8cbed0ebac40..0b9993c1f197 100644 --- a/pkgs/tools/misc/fluentd/Gemfile +++ b/pkgs/tools/misc/fluentd/Gemfile @@ -6,7 +6,6 @@ gem 'fluent-plugin-s3' gem 'fluent-plugin-kinesis' gem 'fluent-plugin-kafka' gem 'fluent-plugin-elasticsearch' -gem 'fluent-plugin-scribe' gem 'fluent-plugin-mongo' gem 'fluent-plugin-webhdfs' gem 'fluent-plugin-rewrite-tag-filter' diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock index 1b1f6cec622e..6b3c8dd459ec 100644 --- a/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/pkgs/tools/misc/fluentd/Gemfile.lock @@ -77,9 +77,6 @@ GEM aws-sdk-s3 (~> 1.0) aws-sdk-sqs (~> 1.0) fluentd (>= 0.14.22, < 2) - fluent-plugin-scribe (1.0.0) - fluentd - thrift (~> 0.8.0) fluent-plugin-webhdfs (1.2.4) fluentd (>= 0.14.22) webhdfs (>= 0.6.0) @@ -110,7 +107,6 @@ GEM sigdump (~> 0.2.2) sigdump (0.2.4) strptime (0.2.3) - thrift (0.8.0) tzinfo (2.0.0) concurrent-ruby (~> 1.0) tzinfo-data (1.2019.2) @@ -131,7 +127,6 @@ DEPENDENCIES fluent-plugin-record-reformer fluent-plugin-rewrite-tag-filter fluent-plugin-s3 - fluent-plugin-scribe fluent-plugin-webhdfs fluentd diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix index 67b72d634bcf..ef063663c1a6 100644 --- a/pkgs/tools/misc/fluentd/gemset.nix +++ b/pkgs/tools/misc/fluentd/gemset.nix @@ -321,17 +321,6 @@ }; version = "1.1.11"; }; - fluent-plugin-scribe = { - dependencies = ["fluentd" "thrift"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19m37d0saknifjg8kva96pgsc7zsmdlwvwiy9gvhi2d6c7bq3q30"; - type = "gem"; - }; - version = "1.0.0"; - }; fluent-plugin-webhdfs = { dependencies = ["fluentd" "webhdfs"]; groups = ["default"]; @@ -487,16 +476,6 @@ }; version = "0.2.3"; }; - thrift = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0aj23ndh5n5yqcvp4c12y7vl5wvxpl66zncf6n6ax2zvb6ig44cv"; - type = "gem"; - }; - version = "0.8.0"; - }; tzinfo = { dependencies = ["concurrent-ruby"]; groups = ["default"]; From b32e2cfc1dd21bbcf05fb1c313a112f18306693d Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Wed, 8 Sep 2021 12:10:31 +0000 Subject: [PATCH 34/95] plexamp: 3.5.0 -> 3.7.0 --- pkgs/applications/audio/plexamp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 9921c1b7e88b..7e1865462e63 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,13 +2,13 @@ let pname = "plexamp"; - version = "3.5.0"; + version = "3.7.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "NjhrtGQsIbNDmGPEDmEbaHSfvUTFb1e7yPorF/BzWTfwVoFZEJiNzP/1k+zTJ4Yfd4mG0W0GYx0jh8m/micWIg=="; + sha512 = "YixaO54+V9RTYS+Of7AVvBtxUEuCdbzlJmyIBj5k8jlD0bvRP1XwIIeADnofKBLAa2ZsmiQunznPLsjQWgr4JA=="; }; appimageContents = appimageTools.extractType2 { @@ -34,7 +34,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/30"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/31"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; From 8276a5e677128c1ca77b876e3ccc55603a427fad Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 6 Sep 2021 12:48:45 -0400 Subject: [PATCH 35/95] notmuch: 0.32.3 -> 0.33 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 4e28d93e8926..3247f45b06f1 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.32.3"; + version = "0.33"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "114bbyjl2ppmy4pw0b5zwmi7lxiz6xd1k6zq0qcgdv7ahkwgybxy"; + hash = "sha256-iD4EW0v6LEjJpGcQYqQGA6f2Flck3VRhi+66EAVJ0mw="; }; nativeBuildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { doxygen # (optional) api docs pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL + pythonPackages.cffi ] ++ lib.optional withEmacs emacs; buildInputs = [ From 12c40d9972f698042cfaf63342ce6beca5c62a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 8 Sep 2021 16:04:31 +0200 Subject: [PATCH 36/95] knot-dns: 3.1.1 -> 3.1.2 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.1.2 The patch was included in this release. --- pkgs/servers/dns/knot-dns/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 4a8ed6a0b080..4363f9665fa4 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,16 +1,15 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , autoreconfHook, nixosTests -, fetchpatch }: stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c"; + sha256 = "580087695df350898b2da8a5c2bdf1dc5eb262ed5ff2cb1538cee480a50fa094"; }; outputs = [ "bin" "out" "dev" ]; @@ -26,11 +25,6 @@ stdenv.mkDerivation rec { # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch ./runtime-deps.patch - # rename task_t to worker_task_t to fix redefinition issues on (aach64-)darwin - (fetchpatch { - url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/a70b718085f9b97e556970444313c37a702a60f7.diff"; - sha256 = "0m776pb9iga0lj2gadk23shfrcfrsrzlyaj8800klw7xh6qq32bm"; - }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; From a2955cd3325c6afa4317d354cc2ee46808e29755 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 8 Sep 2021 17:47:48 +0000 Subject: [PATCH 37/95] python38Packages.pulsectl: 21.5.18 -> 21.9.1 --- pkgs/development/python-modules/pulsectl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 83dd2f5fae3c..72c2689d3833 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.5.18"; + version = "21.9.1"; src = fetchPypi { inherit pname version; - sha256 = "0n448nkm2i4gnsq48vbj8sldmyx0b7c7rvzijg8h2pxdrmilbqql"; + sha256 = "8eef4dbfc97d984e63fd609a3f690d005173ec5342be88d10f67dd507affdf32"; }; patches = [ From 2bcd3dad866e70b0dc4943d3ff32ffcd487ec301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 8 Sep 2021 20:08:44 +0200 Subject: [PATCH 38/95] nixos/top-level: Check activation script syntax --- nixos/modules/system/activation/top-level.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 80835d9688f2..616e1422aa8c 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -61,6 +61,8 @@ let substituteInPlace $out/dry-activate --subst-var out chmod u+x $out/activate $out/dry-activate unset activationScript dryActivationScript + ${pkgs.runtimeShell} -n $out/activate + ${pkgs.runtimeShell} -n $out/dry-activate cp ${config.system.build.bootStage2} $out/init substituteInPlace $out/init --subst-var-by systemConfig $out From 889fb37036cac83a90f1b09f38f50c29e9d23a20 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 8 Sep 2021 11:49:21 -0500 Subject: [PATCH 39/95] top-level/all-packages: remove redundant pkgs --- pkgs/top-level/all-packages.nix | 72 ++++++++++++++++----------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 551678ca4a20..6cde5c4ab495 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -628,7 +628,7 @@ with pkgs; mkShell = callPackage ../build-support/mkshell { }; mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacs.pkgs) inherit-local; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -692,7 +692,7 @@ with pkgs; enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; makeGCOVReport = makeSetupHook - { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; } + { deps = [ lcov enableGCOVInstrumentation ]; } ../build-support/setup-hooks/make-coverage-analysis-report.sh; # intended to be used like nix-build -E 'with import {}; enableDebugging fooPackage' @@ -2197,7 +2197,7 @@ with pkgs; calamares = libsForQt515.callPackage ../tools/misc/calamares { python = python3; - boost = pkgs.boost.override { enablePython = true; python = python3; }; + boost = boost.override { enablePython = true; python = python3; }; }; calendar-cli = callPackage ../tools/networking/calendar-cli { }; @@ -3134,7 +3134,7 @@ with pkgs; moonraker = callPackage ../servers/moonraker { }; mousetweaks = callPackage ../applications/accessibility/mousetweaks { - inherit (pkgs.xorg) libX11 libXtst libXfixes; + inherit (xorg) libX11 libXtst libXfixes; }; mp3blaster = callPackage ../applications/audio/mp3blaster { }; @@ -4696,7 +4696,7 @@ with pkgs; entr = callPackage ../tools/misc/entr { }; - envchain = callPackage ../tools/misc/envchain { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; + envchain = callPackage ../tools/misc/envchain { inherit (darwin.apple_sdk.frameworks) Security; }; eot_utilities = callPackage ../tools/misc/eot-utilities { }; @@ -5281,7 +5281,7 @@ with pkgs; git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { }; git-cliff = callPackage ../applications/version-management/git-and-tools/git-cliff { - inherit (pkgs.darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security; }; git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { }; @@ -5979,7 +5979,7 @@ with pkgs; html-proofer = callPackage ../tools/misc/html-proofer { }; htmlq = callPackage ../development/tools/htmlq { - inherit (pkgs.darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security; }; htpdate = callPackage ../tools/networking/htpdate { }; @@ -6759,11 +6759,11 @@ with pkgs; nodejs-slim_latest = nodejs-slim-16_x; nodePackages_latest = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { - nodejs = pkgs.nodejs_latest; + nodejs = nodejs_latest; }); nodePackages = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { - nodejs = pkgs.nodejs; + inherit nodejs; }); np2kai = callPackage ../misc/emulators/np2kai { }; @@ -11784,17 +11784,17 @@ with pkgs; openspin = callPackage ../development/compilers/openspin { }; - oraclejdk = pkgs.jdkdistro true false; + oraclejdk = jdkdistro true false; - oraclejdk8 = pkgs.oraclejdk8distro true false; + oraclejdk8 = oraclejdk8distro true false; - oraclejre = lowPrio (pkgs.jdkdistro false false); + oraclejre = lowPrio (jdkdistro false false); - oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); + oraclejre8 = lowPrio (oraclejdk8distro false false); jrePlugin = jre8Plugin; - jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); + jre8Plugin = lowPrio (oraclejdk8distro false true); jdkdistro = oraclejdk8distro; @@ -12488,7 +12488,7 @@ with pkgs; }); thrust = callPackage ../development/tools/thrust { - gconf = pkgs.gnome2.GConf; + gconf = gnome2.GConf; }; tinycc = callPackage ../development/compilers/tinycc { }; @@ -13464,7 +13464,7 @@ with pkgs; bison = callPackage ../development/tools/parsing/bison { }; # Ruby fails to build with current bison - bison_3_5 = pkgs.bison.overrideAttrs (oldAttrs: rec { + bison_3_5 = bison.overrideAttrs (oldAttrs: rec { version = "3.5.4"; src = fetchurl { url = "mirror://gnu/${oldAttrs.pname}/${oldAttrs.pname}-${version}.tar.gz"; @@ -13633,7 +13633,7 @@ with pkgs; cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { - inherit (pkgs) cmake; + inherit cmake; }; # Does not actually depend on Qt 5 @@ -14267,17 +14267,17 @@ with pkgs; }; nwjs = callPackage ../development/tools/nwjs { - gconf = pkgs.gnome2.GConf; + gconf = gnome2.GConf; }; nwjs-sdk = callPackage ../development/tools/nwjs { - gconf = pkgs.gnome2.GConf; + gconf = gnome2.GConf; sdk = true; }; # only kept for nixui, see https://github.com/matejc/nixui/issues/27 nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix { - gconf = pkgs.gnome2.GConf; + gconf = gnome2.GConf; }; # NOTE: Override and set useIcon = false to use Awk instead of Icon. @@ -15386,7 +15386,7 @@ with pkgs; faad2 = callPackage ../development/libraries/faad2 { }; factor-lang = callPackage ../development/compilers/factor-lang { - inherit (pkgs.gnome2) gtkglext; + inherit (gnome2) gtkglext; }; far2l = callPackage ../applications/misc/far2l { @@ -18390,14 +18390,14 @@ with pkgs; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true - inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs; + inherit (gnome2) libgnomeui GConf gnome_vfs; cups = if stdenv.isLinux then cups else null; # XXX: mariadb doesn't built on fbsd as of nov 2015 libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null; - inherit (pkgs.darwin) libobjc; - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; qmake48Hook = makeSetupHook @@ -20291,7 +20291,7 @@ with pkgs; mariadb = callPackage ../servers/sql/mariadb { inherit (darwin) cctools; - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk.frameworks) CoreServices; }; mongodb = hiPrio mongodb-3_4; @@ -21191,7 +21191,7 @@ with pkgs; open-isns = callPackage ../os-specific/linux/open-isns { }; osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp { - inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit; }; macfuse-stubs = callPackage ../os-specific/darwin/macfuse { @@ -23642,7 +23642,7 @@ with pkgs; libxkbcommon = libxkbcommon_7; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { - inherit (pkgs) bitwig-studio1; + inherit bitwig-studio1; }; bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { }; bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { }; @@ -24013,7 +24013,7 @@ with pkgs; dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { - inherit (pkgs.gnome2) libart_lgpl libgnomeui; + inherit (gnome2) libart_lgpl libgnomeui; }; direwolf = callPackage ../applications/radio/direwolf { @@ -25566,7 +25566,7 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; k3d = callPackage ../applications/graphics/k3d { - inherit (pkgs.gnome2) gtkglext; + inherit (gnome2) gtkglext; stdenv = gcc6Stdenv; boost = boost155.override { enablePython = true; @@ -26055,7 +26055,7 @@ with pkgs; # Needs qtwebkit which is broken on qt5.15 mendeley = libsForQt514.callPackage ../applications/office/mendeley { - gconf = pkgs.gnome2.GConf; + gconf = gnome2.GConf; }; menumaker = callPackage ../applications/misc/menumaker { }; @@ -26735,7 +26735,7 @@ with pkgs; opera = callPackage ../applications/networking/browsers/opera {}; orca = python3Packages.callPackage ../applications/misc/orca { - inherit (pkgs) pkg-config; + inherit pkg-config; }; orca-c = callPackage ../applications/audio/orca-c {}; @@ -31221,7 +31221,7 @@ with pkgs; celestia = callPackage ../applications/science/astronomy/celestia { autoreconfHook = buildPackages.autoreconfHook269; - inherit (pkgs.gnome2) gtkglext; + inherit (gnome2) gtkglext; }; convertall = qt5.callPackage ../applications/science/misc/convertall { }; @@ -31477,7 +31477,7 @@ with pkgs; depotdownloader = callPackage ../tools/misc/depotdownloader { }; - desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome2) gtkglext libglade; }; + desmume = callPackage ../misc/emulators/desmume { inherit (gnome2) gtkglext libglade; }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -32132,7 +32132,7 @@ with pkgs; rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { - inherit (pkgs) glib gtk3 gobject-introspection wrapGAppsHook; + inherit glib gtk3 gobject-introspection wrapGAppsHook; }; rpl = callPackage ../tools/text/rpl { @@ -32635,11 +32635,11 @@ with pkgs; yuzu-mainline = import ../misc/emulators/yuzu { branch = "mainline"; - inherit (pkgs) libsForQt5 fetchFromGitHub; + inherit libsForQt5 fetchFromGitHub; }; yuzu-ea = import ../misc/emulators/yuzu { branch = "early-access"; - inherit (pkgs) libsForQt5 fetchFromGitHub; + inherit libsForQt5 fetchFromGitHub; }; zap = callPackage ../tools/networking/zap { }; From 60ac8a804ffbef131bbbabef41d4ab2efbaa701d Mon Sep 17 00:00:00 2001 From: Akshat Agarwal Date: Thu, 9 Sep 2021 01:20:06 +0530 Subject: [PATCH 40/95] cilium-cli: 0.8.6 -> 0.9.0 --- pkgs/applications/networking/cluster/cilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 1ee8f31ed890..5984710d8c29 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.8.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "07p62zifycw7gnwkd3230jsjns80k2q9fbj8drzp84s9cp7ddpa9"; + sha256 = "05qc1fcf4ahl1zvxv92mq3awiy5b1rq6r9l896b4hkp0m5lx9m3c"; }; vendorSha256 = null; From 0ad75c87c9b92f853b8e11f939373615aafc64d9 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 1 Sep 2021 23:20:21 +0200 Subject: [PATCH 41/95] hydrus: 452 -> 454 --- 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 db14df2c1ee3..b429f5fb65bb 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 = "452"; + version = "454"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "1zzrw1fbbbayq322346dqb3a8bzb3xnx1qmdciq01dmlbc3bmza1"; + sha256 = "sha256-AX72fOiwp/CLaaGxBBKlcRskwayHCeUC2/FGUoXp3lU="; }; nativeBuildInputs = [ From db6133acf173987e87ea1d0d98d7dea3563542b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Sep 2021 01:32:28 +0200 Subject: [PATCH 42/95] python3Packages.dpath: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/dpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 8756557e64ca..387dbfa1f64d 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dpath"; - version = "2.0.2"; + version = "2.0.3"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "sha256-BA2+ShAeG2sbZenaJYU08PCwrgCjsf0tWS/oV5/4N64="; + sha256 = "sha256-p6icMudH3zqfKkRrt5dHLjWb66UzlRW3pvZbIzsqMac="; }; # use pytest as nosetests hangs From 8609a1bca3675a36f19552897961111eb1f19f73 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 9 Sep 2021 01:34:21 +0200 Subject: [PATCH 43/95] zimg: 3.0.2 -> 3.0.3 --- pkgs/development/libraries/zimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 76334bb3532f..38b106d474b7 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "19qim6vyfas0m09piiw0pw7i0xjzi8vs6bx716gz472nflsg1604"; + sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20"; }; nativeBuildInputs = [ autoreconfHook ]; From 67173fba04df8cf1c375d819a162f80adfe4b3d7 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 9 Sep 2021 02:11:49 +0200 Subject: [PATCH 44/95] monero: 0.17.2.0 -> 0.17.2.3 --- pkgs/applications/blockchains/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 7dd2e569021a..ad07c3eba0b9 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.2.0"; + version = "0.17.2.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0jwlmrpzisvw1c06cvd5b3s3hd4w0pa1qmrypfwah67qj3x6hnb6"; + sha256 = "0nax991fshfh51grhh2ryfrwwws35k16gzl1l3niva28zff2xmq6"; fetchSubmodules = true; }; From 17bb4a0492a081801d2d613599d3324aa56a9e4f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 9 Sep 2021 02:12:10 +0200 Subject: [PATCH 45/95] monero-gui: 0.17.2.2 -> 0.17.2.3 --- pkgs/applications/blockchains/monero-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index d7a27dd4bccc..54e9400e3d58 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.2.2"; + version = "0.17.2.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1k3grbd3wydy5gv6d8x35skv1v97lhh6awd9i87im9lz4kn8ywkd"; + sha256 = "1d8y5yqyw0db2jdv9mwkczwm2qcwhzyslvq994yq5rvs4vkd8xjg"; }; nativeBuildInputs = [ From 685621be34fecca351bf0b3af0c91b9d34a981cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Sep 2021 00:24:06 +0000 Subject: [PATCH 46/95] flexget: 3.1.136 -> 3.1.137 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index dbbcc6596640..8b81d1134353 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.136"; + version = "3.1.137"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "058sja2miwhr6lx5j8r9d97k4ywh6dsxd05nb5w19z6a0sq1vmyb"; + sha256 = "15zl97laijn42rhh524rfb3h1rky461hwfnlny2maa3h61889xrv"; }; postPatch = '' From 90ec05be8f7475d0f7f8c8c5e81545d5689f6ab1 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 8 Sep 2021 20:56:13 -0400 Subject: [PATCH 47/95] csview: init at 0.3.8 --- pkgs/tools/text/csview/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/text/csview/default.nix diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix new file mode 100644 index 000000000000..60186a6b3b75 --- /dev/null +++ b/pkgs/tools/text/csview/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "csview"; + version = "0.3.8"; + + src = fetchFromGitHub { + owner = "wfxr"; + repo = pname; + rev = "v${version}"; + sha256 = "18bz12yn85h9vj0b18iaziix9km2iwh8gwfs93fddjv6kg87p38q"; + }; + + cargoSha256 = "1my6gl8zq5k7clzapgbf1mmcgq8mmdbhl250rdd1fvfd59wkrwra"; + + meta = with lib; { + description = "A high performance csv viewer with cjk/emoji support"; + homepage = "https://github.com/wfxr/csview"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 122658d0848d..dd9376723566 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2442,6 +2442,8 @@ with pkgs; csv2odf = callPackage ../applications/office/csv2odf { }; + csview = callPackage ../tools/text/csview { }; + csvkit = callPackage ../tools/text/csvkit { }; csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { }; From 52731e1d01f9d2eabe55b4ab3f1caa28971e6bea Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 8 Sep 2021 21:35:11 -0400 Subject: [PATCH 48/95] tv: init at 0.5.1 --- pkgs/tools/text/tv/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/text/tv/default.nix diff --git a/pkgs/tools/text/tv/default.nix b/pkgs/tools/text/tv/default.nix new file mode 100644 index 000000000000..1f0e4078f3f1 --- /dev/null +++ b/pkgs/tools/text/tv/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "tv"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "uzimaru0000"; + repo = pname; + rev = "v${version}"; + sha256 = "07gcs64j468213jxcjjv9vywzvfair7gbaiqzqm9wwsdgjyw0wwc"; + }; + + cargoSha256 = "00fi7wimr0rihf6qx20r77w85w2i55kn823gp283lsszbw1z8as9"; + + meta = with lib; { + description = "Format json into table view"; + homepage = "https://github.com/uzimaru0000/tv"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 122658d0848d..721d52723833 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9698,6 +9698,8 @@ with pkgs; turses = callPackage ../applications/networking/instant-messengers/turses { }; + tv = callPackage ../tools/text/tv { }; + tvm = callPackage ../development/compilers/tvm { }; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; From 5c002b979bbe3c857ec87f2c84164d8266bc0781 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 8 Sep 2021 22:49:41 -0400 Subject: [PATCH 49/95] mask: init at 0.11.0 --- pkgs/development/tools/mask/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/mask/default.nix diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix new file mode 100644 index 000000000000..25ab4ceab5f5 --- /dev/null +++ b/pkgs/development/tools/mask/default.nix @@ -0,0 +1,25 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "mask"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "jakedeichert"; + repo = pname; + rev = "v${version}"; + sha256 = "0gsfs837nzh71df6p6klcsgxp471c8hq14xqd62q5bsv7jg9dygc"; + }; + + cargoSha256 = "1h4sasqdl3rli0v6lizdci0vvr2fvbyhllddxwv8vx8r7w9ry963"; + + # tests require mask to be installed + doCheck = false; + + meta = with lib; { + description = "A CLI task runner defined by a simple markdown file"; + homepage = "https://github.com/jakedeichert/mask"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 122658d0848d..37bf2e2223ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6596,6 +6596,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + mask = callPackage ../development/tools/mask { }; + mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { }; /* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails From 5dd0e70d95cd282d4e4937b509e7d411d2c6fd84 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Thu, 9 Sep 2021 03:57:44 +0000 Subject: [PATCH 50/95] exploitdb: 2021-09-03 -> 2021-09-08 --- 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 b112627656b1..0ad2f6ad26fb 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-09-03"; + version = "2021-09-08"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-9roj5/DfbbN98jy/aO1Ua4pTMxgr4UbqXFicN2ONQgE="; + sha256 = "sha256-q6XALX0sGzgUm2PRwlDfcQHZFH+8ExageMahXJ+EYdM="; }; installPhase = '' From 68ed591187356ed90cde04b500e4e236d612c7e8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 9 Sep 2021 04:20:00 +0000 Subject: [PATCH 51/95] postgresqlPackages.pg_auto_failover: 1.6.1 -> 1.6.2 https://github.com/citusdata/pg_auto_failover/releases/tag/v1.6.2 --- pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index c51cd9117a46..cb0aac6147fe 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "0bg1qxjszqnv0c5k5vf60sh8lcfagp9d66sprkf0d83yjh5qpwlm"; + sha256 = "158rr0q2y34mjikripz7n61gc3ivj29brxxz4yq72qbz5bd859yj"; }; buildInputs = [ postgresql openssl zlib readline libkrb5 ]; From cfe9aad7f8d4a3b2a4c84934d36b1c4ca6e80e18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Sep 2021 04:31:24 +0000 Subject: [PATCH 52/95] python38Packages.google-cloud-storage: 1.42.0 -> 1.42.1 --- .../python-modules/google-cloud-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index dcf4028aeef7..be3abb363711 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.42.0"; + version = "1.42.1"; src = fetchPypi { inherit pname version; - sha256 = "c1dd3d09198edcf24ec6803dd4545e867d82b998f06a68ead3b6857b1840bdae"; + sha256 = "b37ec5b0cd69aacb09270674c4c14873898cbc77624d17fef41ec0cb08004866"; }; propagatedBuildInputs = [ From 80a925e7981e0689de04e42a3902dfe722a38a94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Sep 2021 05:34:41 +0000 Subject: [PATCH 53/95] python38Packages.google-cloud-os-config: 1.4.0 -> 1.5.0 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 33bbb00c306e..b521854c4b18 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "d12622901fb2ef5b736606fd00e77900105944c35d737ff794a59fd9a3d71325"; + sha256 = "69764c406c8e1a95b66a84c042b7023c13eaef3bf79e493e60edd9ce62e8f2e4"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 3080ccb11a82776982368fb221428e039ed82ac6 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 30 Aug 2021 01:05:16 -0700 Subject: [PATCH 54/95] ocamlPackages.jsonrpc: drop unnecesary dependencies for 1.7.0 The latest version of jsonrpc does not require any dependencies apart from dune or ocaml Signed-off-by: Rudi Grinberg --- pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index a1d457f8775f..a6867aac63ad 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -31,9 +31,17 @@ buildDunePackage rec { useDune2 = true; minimumOCamlVersion = "4.06"; - buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ]; + buildInputs = + if lib.versionAtLeast version "1.7.0" then + [ ] + else + [ yojson stdlib-shims ocaml-syntax-shims ]; - propagatedBuildInputs = [ ppx_yojson_conv_lib result ]; + propagatedBuildInputs = + if lib.versionAtLeast version "1.7.0" then + [ ] + else + [ ppx_yojson_conv_lib result ]; meta = with lib; { description = "Jsonrpc protocol implementation in OCaml"; From af82bb0abf2b16f6b077bc48633e6daf68414c31 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 30 Aug 2021 01:28:10 -0700 Subject: [PATCH 55/95] ocamlPackages.ocaml-lsp: fix minimum ocaml version ocaml-lsp 1.7.0 is only available for OCaml 4.12 and above. For previous version of OCaml, an old version must be used. 1.7.0 only supports 4.12 Signed-off-by: Rudi Grinberg --- pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index f81def4a7b40..fb38dea3d4cf 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -14,11 +14,15 @@ , cmdliner }: -buildDunePackage { +buildDunePackage rec { pname = "lsp"; inherit (jsonrpc) version src; useDune2 = true; - minimumOCamlVersion = "4.06"; + minimumOCamlVersion = + if lib.versionAtLeast version "1.7.0" then + "4.12" + else + "4.06"; # unvendor some (not all) dependencies. # They are vendored by upstream only because it is then easier to install From 7e10715778240535cc6e4db19bcdfb7c89378b71 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 30 Aug 2021 01:36:27 -0700 Subject: [PATCH 56/95] ocamlPackages.ocaml-lsp: fix list of dependencies for 1.7.0 ocaml-lsp 1.7.0 depends on re which was omitted. it also does not depend on cppo, ocaml-syntax-shims, stdlib-shims. Signed-off-by: Rudi Grinberg --- .../ocaml-modules/ocaml-lsp/lsp.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index fb38dea3d4cf..869e9f633540 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -9,6 +9,7 @@ , octavius , dune-build-info , uutf +, re , pp , csexp , cmdliner @@ -32,22 +33,24 @@ buildDunePackage rec { rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner} ''; - buildInputs = [ - cppo - ppx_yojson_conv_lib - ocaml-syntax-shims - octavius - dune-build-info - omd - cmdliner - ] ++ lib.optional (lib.versionAtLeast jsonrpc.version "1.7.0") pp; + buildInputs = + if lib.versionAtLeast version "1.7.0" then + [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ] + else + [ cppo + ppx_yojson_conv_lib + ocaml-syntax-shims + octavius + dune-build-info + omd + cmdliner + ]; propagatedBuildInputs = [ csexp jsonrpc - stdlib-shims uutf - ]; + ] ++ lib.optional (lib.versionOlder version "1.7.0") stdlib-shims; meta = jsonrpc.meta // { description = "LSP protocol implementation in OCaml"; From 307690708af02db7c435367aa854cda623bb892b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Sep 2021 23:17:33 +0000 Subject: [PATCH 57/95] build(deps): bump cachix/install-nix-action from 13 to 14 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 13 to 14. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v13...v14) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/basic-eval.yml | 2 +- .github/workflows/editorconfig.yml | 2 +- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- .github/workflows/nixos-manual.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 3d12eda314f1..b7bbbd40b451 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -15,6 +15,6 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 4960e9fd3d23..1934a24c65af 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -28,7 +28,7 @@ jobs: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge if: env.PR_DIFF - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 if: env.PR_DIFF with: # nixpkgs commit is pinned so that it doesn't break diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index edd2755302a1..01bbe1b12bf2 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index e27a281a9332..d0c3f5959157 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml index 2a1c1c29738e..70f61a1a3a88 100644 --- a/.github/workflows/nixos-manual.yml +++ b/.github/workflows/nixos-manual.yml @@ -19,7 +19,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v12 + - uses: cachix/install-nix-action@v14 - name: Check DocBook files generated from Markdown are consistent run: | nixos/doc/manual/md-to-db.sh From 4b05f3192eb1ff2ea07f26b8eeb09278a17f5be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 9 Sep 2021 10:32:11 +0200 Subject: [PATCH 58/95] python39Packages.google-cloud-asset: remove unused input, outdated postPatch --- .../python-modules/google-cloud-asset/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index d2132533c84c..737df80f39a3 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -9,7 +9,6 @@ , google-cloud-testutils , libcst , proto-plus -, pytest , pytest-asyncio , pytestCheckHook , mock @@ -24,11 +23,6 @@ buildPythonPackage rec { sha256 = "7d7218ffdd17d64184e1de69ef016f1f070bb0c888785510c4731948b078067d"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2"' - ''; - propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core From f94193eb397a2dc12df1dc9fa46ad61864abec08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 9 Sep 2021 10:32:49 +0200 Subject: [PATCH 59/95] python39Packages.google-resumable-media: remove duplicated checkInput with propagatedBuildInputs --- .../python-modules/google-resumable-media/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 077fc45526c7..f29604c9da30 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ google-auth google-crc32c requests ]; - checkInputs = [ google-auth google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; preCheck = '' # prevent shadowing imports From 6511f4cb3e3222ba6a9b7cb0ae03d66b28465102 Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Thu, 9 Sep 2021 11:03:41 +0200 Subject: [PATCH 60/95] tremc: fix crash with python 3.9 (#137107) Co-authored-by: Sandro --- pkgs/applications/networking/p2p/tremc/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 3518c86790b7..ea6b92c08e7e 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages , x11Support ? !stdenv.isDarwin , xclip ? null , pbcopy ? null @@ -21,6 +21,15 @@ python3Packages.buildPythonApplication rec { sha256 = "1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5"; }; + patches = [ + # Remove when version >0.9.2 is released + (fetchpatch { + url = "https://github.com/tremc/tremc/commit/bdffff2bd76186a4e3488b83f719fc7f7e3362b6.patch"; + sha256 = "1zip2skh22v0yyv2hmszxn5jshp9m1jpw0fsyfvmqfxzq7m3czy5"; + name = "replace-decodestring-with-decodebytes.patch"; + }) + ]; + buildInputs = with python3Packages; [ python wrapPython From c9d8b264d63392afd8cb388feae1ce9c7ab83654 Mon Sep 17 00:00:00 2001 From: Rafael Arquero Date: Thu, 9 Sep 2021 11:40:39 +0200 Subject: [PATCH 61/95] pulumi-bin: 3.10.0 -> 3.12.0 --- pkgs/tools/admin/pulumi/data.nix | 122 +++++++++++++++--------------- pkgs/tools/admin/pulumi/update.sh | 30 ++++---- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 9f1239923ec4..1a92d86ccf37 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,68 +1,68 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.10.0"; + version = "3.12.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.10.0-linux-x64.tar.gz"; - sha256 = "0rhsdxiz5lz4hlw6a1pkjfblsh42vnk9bw8xg7wbjl9wpld3rys1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-linux-x64.tar.gz"; + sha256 = "19b8yndff9ziilrw1lrwjjcxl1lpn9q52z5swjc41rr0j751v8b0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.15.0-linux-amd64.tar.gz"; - sha256 = "1s8w5kh9nfdv1vcdrpa2m76r2470k0j4frc3j3ijmqq1i0vv5yhk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-linux-amd64.tar.gz"; + sha256 = "10hgsnab1472dzdb2qrx90mx1xaq8zifcnrsgqqvilzfjnfrd9ka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.4.0-linux-amd64.tar.gz"; - sha256 = "0scisiswjs3jx0wm6q8i7pgpr2js3kiilq7wc29afyjck6xa14rh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-linux-amd64.tar.gz"; + sha256 = "0rk1irqnmlxzdwx1jnls30xmsrkdn7qin561waqwxq9qrm5012i5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-linux-amd64.tar.gz"; - sha256 = "14s6jyackhp324gdlvvqnyi8s7hj0fb92ilrpd460p05p653zb4x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-amd64.tar.gz"; + sha256 = "1f995sg2p1hpqagygsvyfq97gcmy4a925274p96vhy517568d5jg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.3.0-linux-amd64.tar.gz"; - sha256 = "1ppwha1zk73w39msp6jym9in7jsrxzc530qgj4lj0961mb9rdkra"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-linux-amd64.tar.gz"; + sha256 = "1hz4w44c31wyi3vbr9sbph1007rj65vwwbhwrrzyhxy0i75r3igq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.0-linux-amd64.tar.gz"; - sha256 = "1a62af80czj9sahb52fiz25p59nbzjlr1h7ycdxpjl9m1bxhvlfr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-linux-amd64.tar.gz"; + sha256 = "1divf2nga5kc60mf0cjmyzyghpkkbw44jakfwc7fjiq6j4j0g2ia"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz"; - sha256 = "06j5k599i8giy5v6scggw8zx1pyfm6w20biwcizv81zk0zkg3fzp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0ffqah4anhdacmfb8n3hdq17jhqq0qclc0l0cq77hvhvgn39yy4r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-linux-amd64.tar.gz"; sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.15.0-linux-amd64.tar.gz"; - sha256 = "11m1f80i33m4dh13z96yh655pfiwvk46sjspwql7s80kapl93pq9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-linux-amd64.tar.gz"; + sha256 = "1vryq0ki5iimqwxpnvc53m15641p1a1cdbf1xzn0ps4xdsg4xz7j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-linux-amd64.tar.gz"; - sha256 = "159lk4iv9zi2ggcjwjsg9an4rfjc0lbyn8d3kbv10p6cx109ljzg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-linux-amd64.tar.gz"; + sha256 = "1k7zd2cir6844awf1kpj7pifwvw74yfnrk78j0pall2jwmnf2zaa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.1.0-linux-amd64.tar.gz"; - sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-amd64.tar.gz"; + sha256 = "1h5159y7xlslnijs8lpi4vqgvj2px6whxk9m17p9n7wiyqbmd5na"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.2.0-linux-amd64.tar.gz"; - sha256 = "0inx40vasjlxfvzr0pxbzm6rki50h5x5qkzx2wc51vv3gjln104q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-linux-amd64.tar.gz"; + sha256 = "0g6h9j64aqj64slp8707kn6dwg32nyqy06xgwycz8ywcw5b2llqp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.6.0-linux-amd64.tar.gz"; - sha256 = "19zvqxf13lr98sp3p1ry3q1fvzx0rpxwz5wbk331n5jn0ljzr783"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-linux-amd64.tar.gz"; + sha256 = "0n7vlja8s854nba209sq2pwkd8jnmnmzya65ncqpb0aa9kn9lc2j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.0-linux-amd64.tar.gz"; - sha256 = "0vyqzphk75h1mk9p6wblgsw2cypycv32glzrnk4fildj48dakm5y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-linux-amd64.tar.gz"; + sha256 = "07zmx5gdwqsrhzm50fj3y9q435ygwmb2j1r2pvpv0i1s66g92kij"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-amd64.tar.gz"; @@ -81,16 +81,16 @@ sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.1.0-linux-amd64.tar.gz"; - sha256 = "0s1fkj1s5qni84lz0gr1d10xyxp87877jana67lxbarskvzpys8r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-linux-amd64.tar.gz"; + sha256 = "1lmy0dmpspzflc9z8p4w1cz47lbqnbkq8dng3v40lpbs75pnprvs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-amd64.tar.gz"; sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.3.0-linux-amd64.tar.gz"; - sha256 = "0rmk55qivand0wa82mxgvyzgg16nz1r3q99k0n9zdlvh9dbffnc8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-linux-amd64.tar.gz"; + sha256 = "1lmhsvzhryj9sl3v51dgq6rby3q5m169mc3dg1jbx1fvgwglmhqb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-amd64.tar.gz"; @@ -99,64 +99,64 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.10.0-darwin-x64.tar.gz"; - sha256 = "18q1v1n3a497wbbzzjngpl90wpjnffn9wnpdp171r47k6xvbcsyq"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-darwin-x64.tar.gz"; + sha256 = "1dlgcap861a5fljbadqikn0lm9gz6f1rdn0qhf1f9vyrj1jmwcqf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.15.0-darwin-amd64.tar.gz"; - sha256 = "1jnwlhfyyxz7196igi3gas3459k4nq1f4m1i4vdnxhkskp5838l0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-darwin-amd64.tar.gz"; + sha256 = "18n729y5r827ahaybz01q61r3cv5grxpnfqb0m8fzh2bd41izg4s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.4.0-darwin-amd64.tar.gz"; - sha256 = "0wy4ayrfqizf8izz5dgwv8xi5hvjh03jrg5lvglfph6549d4lpwc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-darwin-amd64.tar.gz"; + sha256 = "05z8zkbhpj0xsi7ffzd51j83sxx92k10r28gpznn43plnv1v5cjs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "1bb78g8k6gnhyxxvcjspnhbw2fig58flr14zi5i1cbd89xkz0m3i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "12nba4xjcrh4g9iy3mqalk56bga4l3izqm9rj0fg3cyivr9fffvr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "1wwldhy6r6985rwx9vv73jb1nsna387sk6mba81lyc55ar67nsp9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "0xknmx3d6083qvp3v2v8qwjlfihj35r8gzhmhbh759ccjf1d6h4h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.0-darwin-amd64.tar.gz"; - sha256 = "062xzx7408xqlppw1nixs205i83436n0cbjngzc65wm03bzzj7mh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-darwin-amd64.tar.gz"; + sha256 = "00m9nn0mrjdqg0ijkv86376df9kpfd9alk8h2ynk53s6nbz9ff4b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "0ffic6mqr1zyskrv60q9wg7jc0hq23l5g0pdh3clpnn2m1xnxnxm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "0j8ysk4wh78xhk3nv6c1dvvyw5ihs7amwlyqicch52yc6jq3v5a6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-darwin-amd64.tar.gz"; sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.15.0-darwin-amd64.tar.gz"; - sha256 = "01vrivbdhsl50kiv092j2a5jvikhrw1kzpa5ags701l721zslycq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-darwin-amd64.tar.gz"; + sha256 = "1cfxnshmc7b1ax819bvic4ih0gc1mi6rij1pp52nklzgby4zad6y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "1iwx80r9kmlrf961zck3qz2jb9shpmywdm5nkflvz6mhwrfsbz72"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-darwin-amd64.tar.gz"; + sha256 = "0fabb3zi5p24xfgsc0jn8ynavd1g0qrlm1yqifxv12zr5id4vcvk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.1.0-darwin-amd64.tar.gz"; - sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-amd64.tar.gz"; + sha256 = "0r2ykjwam5m2mfiibhq993s8n5pzmks837cwb57jwgwx8lc3ra4x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.2.0-darwin-amd64.tar.gz"; - sha256 = "0bj7ir7dpkfsb75bjl45irwi692zxnys0125kmwdn8gnamlij5fx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-darwin-amd64.tar.gz"; + sha256 = "03r5jxgjyrrpx082z785x2yxz3l4ja4al9yh2zhkvdcnjip88r35"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.6.0-darwin-amd64.tar.gz"; - sha256 = "0i06q1hrxi84r8ss3ck7jgk3g4lblkjvgm3wx35v551l0ynmmqqw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-darwin-amd64.tar.gz"; + sha256 = "0l1wxnkik28y9y257jdxiq3m3njmfq1awxajp152k11izddxs05i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "0fwbh02n7cjmv6d9jbqpjnmvvdp1cnsyhy7gxd2863j4w5f17q48"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-darwin-amd64.tar.gz"; + sha256 = "0s8aaac55kdsid0ay2dm0if9irc55pslmy6lhf7v5bfpcb17i36w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-amd64.tar.gz"; @@ -175,16 +175,16 @@ sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "1x5fm72v9h3lrqcyyq2xm14bc14rsqhjmc4mwa2wgbk4pvjgawyv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "1j7z5dbqzsdq1q8ks9g5pwzyc3ml6avhhp6xj94dzdhskl6pd8w5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-amd64.tar.gz"; sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.3.0-darwin-amd64.tar.gz"; - sha256 = "0ay8d84fc1hr1n4fpy1a4nj7bmhxzp86p0x68gz4rr9iwrd7xfgl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "01rrmj95lhvwxi8f338f50l2zspnin41j8hi2j9pjsjwfayhpq93"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-amd64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index b65ea5e34968..69c417252cc3 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,32 +3,32 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.10.0" +VERSION="3.12.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( "auth0=2.2.0" - "aws=4.15.0" - "cloudflare=3.4.0" - "consul=3.2.0" - "datadog=3.3.0" - "digitalocean=4.6.0" - "docker=3.0.0" + "aws=4.19.0" + "cloudflare=3.5.0" + "consul=3.3.0" + "datadog=4.1.0" + "digitalocean=4.6.1" + "docker=3.1.0" "equinix-metal=2.0.0" - "gcp=5.15.0" - "github=4.2.0" - "gitlab=4.1.0" - "hcloud=1.2.0" - "kubernetes=3.6.0" - "linode=3.3.0" + "gcp=5.18.0" + "github=4.3.0" + "gitlab=4.2.0" + "hcloud=1.4.0" + "kubernetes=3.7.0" + "linode=3.3.2" "mailgun=3.1.0" "mysql=3.0.0" "openstack=3.3.0" "packet=3.2.2" - "postgresql=3.1.0" + "postgresql=3.2.0" "random=4.2.0" - "vault=4.3.0" + "vault=4.4.0" "vsphere=4.0.1" ) From 3e788570514ec7098f2e7fd00edc673fc89b3a21 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 9 Sep 2021 11:24:50 +0300 Subject: [PATCH 62/95] =?UTF-8?q?josm:=2018118=20=E2=86=92=2018193?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/josm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 71d70774b11a..93e08b660787 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18118"; + version = "18193"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "01wcbf1mh1gqxnqkc3j6h64h9sz0yd5wiwpyx4ic4d5fwkh65qym"; + sha256 = "sha256-55lrPOlQQx1rmmIzBJ522zSia7RmVNTeHuE20vE1d6A="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "0i1vglqg49fd3w2bny01l92wj4hvr3y35rrmd1mdff0lc1zhi397"; + sha256 = "sha256-OoDX5tPTLrUgGfBa11dFVyeuXSai8QJNeQLWwot2ksk="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "0gyj9kdzl920mjdmqjgiscqxyqhnvh22l6sjicf059ga0fsr3ki1"; + sha256 = "sha256-uXXS+urNCrGnalIAj49Bp1S+pXya/XhdfEWvPmcKKII="; }; }; in From 34e468dc4268cee86aa019ae9bc52768e60fb5f7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 7 Sep 2021 10:10:38 +0100 Subject: [PATCH 63/95] lib/systems: add minimal s390x-linux cross-compile support Tested basic functionality as: $ nix-build --arg crossSystem '{ config = "s390x-unknown-linux-gnu"; }' -A re2c $ file ./result/bin/re2c $ ./result/bin/re2c: ELF 64-bit MSB executable, IBM S/390, version 1 (SYSV), dynamically linked, interpreter ...-gnu-2.33-50/lib/ld64.so.1, for GNU/Linux 2.6.32, not stripped $ qemu-s390x ./result/bin/re2c --version re2c 2.2 --- lib/systems/default.nix | 1 + lib/systems/doubles.nix | 5 +++-- lib/systems/examples.nix | 4 ++++ lib/systems/parse.nix | 1 + lib/tests/systems.nix | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 70ec98b03c16..ef609859abbf 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -107,6 +107,7 @@ rec { else if final.isMips then "mips" else if final.isPower then "powerpc" else if final.isRiscV then "riscv" + else if final.isS390 then "s390" else final.parsed.cpu.name; qemuArch = diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index e577059687b0..8af3377fb5bf 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -28,7 +28,7 @@ let "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" - "riscv64-linux" "s390-linux" "x86_64-linux" + "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" # MMIXware "mmix-mmixware" @@ -41,7 +41,8 @@ let # none "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" "or1k-none" "m68k-none" "powerpc-none" - "riscv32-none" "riscv64-none" "s390-none" "vc4-none" "x86_64-none" + "riscv32-none" "riscv64-none" "s390-none" "s390x-none" "vc4-none" + "x86_64-none" # OpenBSD "i686-openbsd" "x86_64-openbsd" diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 32b236d6960c..8dfa22ac787e 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -152,6 +152,10 @@ rec { config = "s390-unknown-linux-gnu"; }; + s390x = { + config = "s390x-unknown-linux-gnu"; + }; + arm-embedded = { config = "arm-none-eabi"; libc = "newlib"; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 77e941a913cf..8a88d8cfbe87 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -106,6 +106,7 @@ rec { riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; }; s390 = { bits = 32; significantByte = bigEndian; family = "s390"; }; + s390x = { bits = 64; significantByte = bigEndian; family = "s390"; }; sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; }; sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; }; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 661b9bc8690c..2646e792682b 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; From 9e3fee0724f66c7505dc63fa4bb584e3014ac251 Mon Sep 17 00:00:00 2001 From: Bastien Riviere Date: Tue, 7 Sep 2021 11:20:04 +0200 Subject: [PATCH 64/95] qmk-dotty-dict: init at 1.3.0.post1 --- .../python-modules/qmk-dotty-dict/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/qmk-dotty-dict/default.nix diff --git a/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/pkgs/development/python-modules/qmk-dotty-dict/default.nix new file mode 100644 index 000000000000..c67d911a3eda --- /dev/null +++ b/pkgs/development/python-modules/qmk-dotty-dict/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, lib, pytest, setuptools-scm }: + +buildPythonPackage rec { + pname = "qmk_dotty_dict"; + version = "1.3.0.post1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-O2EeOTZgv6poNcaOlHhLroD+B7hJCXi17KsDoNL8fqI="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + doCheck = false; + + meta = with lib; { + description = "Dictionary wrapper for quick access to deeply nested keys"; + homepage = "https://github.com/pawelzny/dotty_dict"; + license = licenses.mit; + maintainers = with maintainers; [ babariviere ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66b5a83c70f0..ecb2bf3e0dab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7565,6 +7565,8 @@ in { queuelib = callPackage ../development/python-modules/queuelib { }; + qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict {}; + r2pipe = callPackage ../development/python-modules/r2pipe { }; rabbitpy = callPackage ../development/python-modules/rabbitpy { }; From d4ff22bee83b9428a8994a8ec32fc4a8f39d9345 Mon Sep 17 00:00:00 2001 From: Bastien Riviere Date: Tue, 7 Sep 2021 11:20:44 +0200 Subject: [PATCH 65/95] qmk: 0.0.52 -> 1.0.0 --- pkgs/tools/misc/qmk/default.nix | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 3fa088d8e2b4..ef25a7361c26 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -1,18 +1,18 @@ -{ lib -, python3 -, fetchpatch -}: +{ lib, python3, fetchpatch, writeText }: let inherit (python3.pkgs) buildPythonApplication fetchPypi; -in -buildPythonApplication rec { + setuppy = writeText "setup.py" '' + from setuptools import setup + setup() + ''; +in buildPythonApplication rec { pname = "qmk"; - version = "0.0.52"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mNF+bRhaL6JhNbROmjYDHkKKokRIALd5FZbRt9Kg5XQ="; + sha256 = "sha256-2mLuxzxFSMw3sLm+OTcgLcOjAdwvJmNhDsynUaYQ+co="; }; nativeBuildInputs = with python3.pkgs; [ @@ -27,7 +27,7 @@ buildPythonApplication rec { appdirs argcomplete colorama - dotty-dict + qmk-dotty-dict hid hjson jsonschema @@ -36,6 +36,10 @@ buildPythonApplication rec { pyusb ]; + postConfigure = '' + cp ${setuppy} setup.py + ''; + # no tests implemented doCheck = false; @@ -57,6 +61,6 @@ buildPythonApplication rec { - ... and many more! ''; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; + maintainers = with maintainers; [ bhipple babariviere ]; }; } From 52e1574f251cafac2c8520bf48db6353178b0f12 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 8 Sep 2021 15:04:31 +0200 Subject: [PATCH 66/95] rocm-smi: add update script and fix url --- pkgs/tools/system/rocm-smi/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index bbee315e9c70..52b75b7a4e9e 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, wrapPython }: +{ lib, stdenv, fetchFromGitHub, writeScript, cmake, wrapPython }: stdenv.mkDerivation rec { pname = "rocm-smi"; @@ -42,9 +42,16 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn $out/bin ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm_smi_lib/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocm-smi "$version" + ''; + meta = with lib; { description = "System management interface for AMD GPUs supported by ROCm"; - homepage = "https://github.com/RadeonOpenCompute/ROC-smi"; + homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib"; license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ]; platforms = [ "x86_64-linux" ]; From f73811932b7e149babbbf157a0c29d3b81e144be Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 8 Sep 2021 16:14:08 +0200 Subject: [PATCH 67/95] rocm-cmake: add update script --- .../tools/build-managers/rocm-cmake/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 31f4265597fe..ad6ac4fc2e5f 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, writeScript, cmake }: stdenv.mkDerivation rec { pname = "rocm-cmake"; @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm-cmake/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version rocm-cmake "$version" + ''; + meta = with lib; { description = "CMake modules for common build tasks for the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; From ea2a723c00f7c3f083042aa45b967655a74ab6a3 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 8 Sep 2021 16:14:29 +0200 Subject: [PATCH 68/95] rocm-thunk: add update script --- pkgs/development/libraries/rocm-thunk/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 432688e1bfb5..4d641f873021 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, writeScript , cmake , pkg-config , numactl @@ -28,6 +29,13 @@ stdenv.mkDerivation rec { cp -r $src/include $out ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCT-Thunk-Interface/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version rocm-thunk "$version" + ''; + meta = with lib; { description = "Radeon open compute thunk interface"; homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; From 315631dfe3645fd92f75de90c39932164a38ebbd Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 8 Sep 2021 16:14:49 +0200 Subject: [PATCH 69/95] rocm-runtime: add update script --- pkgs/development/libraries/rocm-runtime/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index fc3c627a5628..ceaa164b867e 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, writeScript , addOpenGLRunpath , clang-unwrapped , cmake @@ -41,6 +42,13 @@ stdenv.mkDerivation rec { rm -rf $out/hsa ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCR-Runtime/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocm-runtime "$version" + ''; + meta = with lib; { description = "Platform runtime for ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; From c3aa2d2e27f365779fce182b6b70d3cd961bbb3b Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 8 Sep 2021 16:14:59 +0200 Subject: [PATCH 70/95] rocm-opencl-runtime: add update script --- .../development/libraries/rocm-opencl-runtime/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 04fba42525ed..d5e45583c97b 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, writeScript , addOpenGLRunpath , cmake , rocm-cmake @@ -74,6 +75,13 @@ stdenv.mkDerivation rec { echo 'add_dependencies(amdocl64 OpenCL)' >> amdocl/CMakeLists.txt ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-OpenCL-Runtime/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version rocm-opencl-runtime "$version" + ''; + meta = with lib; { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; From 1ab7362a4e1c3176a1a6a5fec8c0ab1c9541e767 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 8 Sep 2021 16:15:14 +0200 Subject: [PATCH 71/95] rocm-device-libs: add update script --- pkgs/development/libraries/rocm-device-libs/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 77dd4b721f2a..e32331486569 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, writeScript , cmake , clang , clang-unwrapped @@ -30,6 +31,13 @@ stdenv.mkDerivation rec { "-DCLANG=${clang}/bin/clang" ]; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-Device-Libs/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocm-device-libs "$version" + ''; + meta = with lib; { description = "Set of AMD-specific device-side language runtime libraries"; homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; From d99dfe5821103299c7b37cbbf1d9fc674ae5b135 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 8 Sep 2021 16:15:25 +0200 Subject: [PATCH 72/95] rocm-comgr: add update script --- pkgs/development/libraries/rocm-comgr/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 52a3cb6784d6..ee646b008a04 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, clang, rocm-device-libs, lld, llvm }: +{ lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, lld, llvm }: stdenv.mkDerivation rec { pname = "rocm-comgr"; @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { -i CMakeLists.txt ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-CompilerSupport/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocm-comgr "$version" + ''; + meta = with lib; { description = "APIs for compiling and inspecting AMDGPU code objects"; homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; From d61ba9863c07f268fe53b78159ab76c3183c6ca1 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Fri, 27 Aug 2021 08:45:33 -0700 Subject: [PATCH 73/95] nodePackages.prisma: init at 2.30.2 --- pkgs/development/node-packages/default.nix | 12 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 155 ++++-- .../tools/database/prisma-engines/default.nix | 61 +++ .../database/prisma-engines/no_tests.patch | 459 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 652 insertions(+), 38 deletions(-) create mode 100644 pkgs/development/tools/database/prisma-engines/default.nix create mode 100644 pkgs/development/tools/database/prisma-engines/no_tests.patch diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 568c75d07ce9..8ad9f2e54a2e 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -267,6 +267,18 @@ let meta.mainProgram = "postcss"; }; + prisma = super.prisma.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = with pkgs; '' + wrapProgram "$out/bin/prisma" \ + --prefix PRISMA_MIGRATION_ENGINE_BINARY : "${prisma-engines}/bin/migration-engine" \ + --prefix PRISMA_QUERY_ENGINE_BINARY : "${prisma-engines}/bin/query-engine" \ + --prefix PRISMA_QUERY_ENGINE_LIBRARY : "${lib.getLib prisma-engines}/libquery_engine.so.node" + --prefix PRISMA_INTROSPECTION_ENGINE_BINARY : "${prisma-engines}/bin/introspection-engine" \ + --prefix PRISMA_FMT_BINARY : "${prisma-engines}/bin/prisma-fmt" + ''; + }; + pulp = super.pulp.override { # tries to install purescript npmFlags = "--ignore-scripts"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index b8ac7e4e7c6d..e4e361757dfe 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -205,6 +205,7 @@ , "postcss-cli" , "prettier" , "prettier-plugin-toml" +, "prisma" , "pscid" , "pulp" , "purescript-language-server" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c34bd5206760..e9b99b055506 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -5206,6 +5206,15 @@ let sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA=="; }; }; + "@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" = { + name = "_at_prisma_slash_engines"; + packageName = "@prisma/engines"; + version = "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db"; + src = fetchurl { + url = "https://registry.npmjs.org/@prisma/engines/-/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz"; + sha512 = "Q9CwN6e5E5Abso7J3A1fHbcF4NXGRINyMnf7WQ07fXaebxTTARY5BNUzy2Mo5uH82eRVO5v7ImNuR044KTjLJg=="; + }; + }; "@protobufjs/aspromise-1.1.2" = { name = "_at_protobufjs_slash_aspromise"; packageName = "@protobufjs/aspromise"; @@ -5566,13 +5575,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.8.1" = { + "@serverless/utils-5.9.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.8.1"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.8.1.tgz"; - sha512 = "tUOvlGq9xpLrq6dguH4bjAJqycoOUx7aVJIjbX4T7MZxuovxg/x2ZXc+Hrfqq0t+jRKVm78ZjHCjCASJDxbYPA=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.9.0.tgz"; + sha512 = "cAPOndJ78N5o3Q4WVXfy/z1bE5QPCUwT2DPj06bd3DGHV3api+NZLeOECG4AdcyPREw/9w1oNxw9555q903KwA=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -25478,15 +25487,6 @@ let sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw=="; }; }; - "fast-safe-stringify-2.1.0" = { - name = "fast-safe-stringify"; - packageName = "fast-safe-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.0.tgz"; - sha512 = "xHSIyDJTOVQjtMBGcUokl3tpaOKgTyVTjlHj255V4Q4J1oho3cnrWrf5sCx8z1jq7gzNMv8y0PH53pYYuZUFPQ=="; - }; - }; "fast-safe-stringify-2.1.1" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; @@ -34003,13 +34003,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.1.0" = { + "jest-worker-27.1.1" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.1.0"; + version = "27.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.0.tgz"; - sha512 = "mO4PHb2QWLn9yRXGp7rkvXLAYuxwhq1ZYUo0LoDhg8wqvv4QizP1ZWEJOeolgbEgAWZLIEU0wsku8J+lGWfBhg=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz"; + sha512 = "XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA=="; }; }; "jimp-compact-0.16.1" = { @@ -56400,6 +56400,33 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; + "ssb-bendy-butt-0.12.3" = { + name = "ssb-bendy-butt"; + packageName = "ssb-bendy-butt"; + version = "0.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.3.tgz"; + sha512 = "fo3Sspdr+cjQzq8F+EKRJiibm06Mt/pzmtAjf0HEOl/pZPTHGFolfsGtZlU4U+RuKOqqZMhxzTXNAwoJ+trdDw=="; + }; + }; + "ssb-bfe-3.1.1" = { + name = "ssb-bfe"; + packageName = "ssb-bfe"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.1.tgz"; + sha512 = "0Z1xxYG618sccFJGNIN9om5sokRFJRv/QlIhlnFwiafNLYFdyLP/KGZ8YDZSUP/pyMWZuL8+o++v3Ro6EkIJNA=="; + }; + }; + "ssb-bfe-spec-0.3.0" = { + name = "ssb-bfe-spec"; + packageName = "ssb-bfe-spec"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.3.0.tgz"; + sha512 = "gmsjEKrcKfR7d/926Oq7ijrd4l0CkjtFampk7rqsE+Gzr1ZpzGmHl1YxXn6GdBYy55M1i0V+w+fYAqsgxl5o4Q=="; + }; + }; "ssb-blobs-1.2.2" = { name = "ssb-blobs"; packageName = "ssb-blobs"; @@ -56454,13 +56481,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.3.1" = { + "ssb-db2-2.4.0" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.3.1.tgz"; - sha512 = "SE/GGoLn29JJeeo/SLGzjtPj5xvafn6so8fBNqM0Hfnk03DwZ7iFG0PuB8L5CMold3sLLDXFjuzdacKf85848Q=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.4.0.tgz"; + sha512 = "UMd6XqBGTHBNPduyEc0ynO+lkCn/8/NTedzDz9XRYQsqk4ed2Js0cWhqeREv0Bz+upfCMmPQBBHASPBw47XTOA=="; }; }; "ssb-ebt-5.6.7" = { @@ -56697,6 +56724,15 @@ let sha512 = "RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg=="; }; }; + "ssb-typescript-2.5.0" = { + name = "ssb-typescript"; + packageName = "ssb-typescript"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-typescript/-/ssb-typescript-2.5.0.tgz"; + sha512 = "j0Q9nAbp5lKwmvIWEaaf+PT5ITHCCb83JeD3ywm/kHDWwcLGLYG8VuwMM5L3X8H1laIORXlQgZlHhK3nfn8LbA=="; + }; + }; "ssb-unix-socket-1.0.0" = { name = "ssb-unix-socket"; packageName = "ssb-unix-socket"; @@ -56706,6 +56742,15 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; + "ssb-uri2-1.5.2" = { + name = "ssb-uri2"; + packageName = "ssb-uri2"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.5.2.tgz"; + sha512 = "jlsN7w6/toFjcRZLDkCC3nq6+rKeS7NhUxZ+xGS1ASltenkudcZvdgczRb+L11ObFND4VCohkO21lVSAJV8hCQ=="; + }; + }; "ssb-validate-4.1.4" = { name = "ssb-validate"; packageName = "ssb-validate"; @@ -69128,7 +69173,7 @@ in sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.1.0" // { + (sources."jest-worker-27.1.1" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -72410,7 +72455,7 @@ in sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -77339,7 +77384,7 @@ in sources."core-util-is-1.0.3" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fecha-4.2.1" sources."fn.name-1.1.0" sources."follow-redirects-1.14.3" @@ -84467,7 +84512,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."faye-websocket-0.10.0" sources."fecha-4.2.1" @@ -87330,7 +87375,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fast-text-encoding-1.0.3" (sources."fast-url-parser-1.1.3" // { dependencies = [ @@ -90628,7 +90673,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."figlet-1.5.0" sources."figures-3.2.0" @@ -98950,7 +98995,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fb-watchman-2.0.1" sources."figgy-pudding-3.5.2" sources."file-uri-to-path-1.0.0" @@ -100550,7 +100595,7 @@ in sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.6" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fecha-2.3.3" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -101469,7 +101514,7 @@ in sources."fast-equals-2.0.3" sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" @@ -107653,6 +107698,27 @@ in bypassCache = true; reconstructLock = true; }; + prisma = nodeEnv.buildNodePackage { + name = "prisma"; + packageName = "prisma"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prisma/-/prisma-3.0.1.tgz"; + sha512 = "ENmYAopd56nkds5/IOSTGixbkbUN2QdEzB4cp/mtaGB/G0OArbP6cnbA/9u02Pe29RdErbNOoIdCGASjpItJwQ=="; + }; + dependencies = [ + sources."@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Prisma is an open-source database toolkit. It includes a JavaScript/TypeScript ORM for Node.js, migrations and a modern GUI to view and edit the data in your database. You can use Prisma in new projects or add it to an existing one."; + homepage = "https://www.prisma.io"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; pscid = nodeEnv.buildNodePackage { name = "pscid"; packageName = "pscid"; @@ -107791,7 +107857,7 @@ in sources."es6-promise-3.3.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gaze-1.1.3" @@ -111833,7 +111899,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.8.1" // { + (sources."@serverless/utils-5.9.0" // { dependencies = [ sources."cli-progress-footer-2.0.0" sources."get-stream-6.0.1" @@ -113282,10 +113348,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.698.0"; + version = "1.700.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.698.0.tgz"; - sha512 = "ivOZ1VCRwGvtOG6c3etxLPdwRjjnXvg9aSXRP7oOSZDQvEWouKDh9HpvkTHm8mZgFACw6hU1cmBseHyMfpYnkw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.700.0.tgz"; + sha512 = "nhhgv2Dh8Wh/qrt5gjS+RrQjEUfwEOU4W6KZnnQrmVAfFwZ4Uis+pXcoTTJtsg/xJ0/eXV/v2UxA6PKPkYMeOw=="; }; buildInputs = globalBuildInputs; meta = { @@ -113589,6 +113655,7 @@ in sources."base64-js-1.5.1" sources."base64-url-2.3.3" sources."bash-color-0.0.4" + sources."bencode-2.0.2" sources."binary-extensions-1.13.1" sources."binary-search-1.3.6" sources."binary-search-bounds-2.0.5" @@ -114098,6 +114165,7 @@ in sources."push-stream-11.0.1" ]; }) + sources."querystringify-2.2.0" sources."quicktask-1.0.1" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" @@ -114193,6 +114261,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" + sources."requires-port-1.0.0" sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" @@ -114266,12 +114335,19 @@ in sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" + (sources."ssb-bendy-butt-0.12.3" // { + dependencies = [ + sources."ssb-keys-8.2.0" + ]; + }) + sources."ssb-bfe-3.1.1" + sources."ssb-bfe-spec-0.3.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.3.1" // { + (sources."ssb-db2-2.4.0" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -114325,7 +114401,9 @@ in sources."ssb-query-2.4.5" sources."ssb-ref-2.16.0" sources."ssb-replicate-1.3.3" + sources."ssb-typescript-2.5.0" sources."ssb-unix-socket-1.0.0" + sources."ssb-uri2-1.5.2" (sources."ssb-validate-4.1.4" // { dependencies = [ sources."ssb-keys-8.2.0" @@ -114418,6 +114496,7 @@ in }) sources."untildify-2.1.0" sources."urix-0.1.0" + sources."url-parse-1.5.3" sources."use-3.1.1" sources."user-home-2.0.0" sources."utf8-byte-length-1.0.4" @@ -120262,7 +120341,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.1.0" + sources."jest-worker-27.1.1" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -122570,7 +122649,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" - sources."jest-worker-27.1.0" + sources."jest-worker-27.1.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix new file mode 100644 index 000000000000..a7021411b4c3 --- /dev/null +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -0,0 +1,61 @@ +{ fetchFromGitHub +, lib +, openssl +, pkg-config +, protobuf +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "prisma-engines"; + version = "2.30.2"; + + src = fetchFromGitHub { + owner = "prisma"; + repo = "prisma-engines"; + rev = version; + sha256 = "sha256-i4r+TRC8454awbqe35Kg3M9xN2NnP8Sbd/dITtm9MDg="; + }; + + cargoPatches = [ + # Remove test from compilation targets: + # they add time to an already long compilation and some fail out-of-the-box. + ./no_tests.patch + ]; + + # Use system openssl. + OPENSSL_NO_VENDOR = 1; + + cargoSha256 = "sha256-BldEj8+tzY0dIA/fdrPLsFn3ZdfoGq6GsomCUhQBoLM="; + + outputs = [ "out" "lib" "bin" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl protobuf ]; + + preBuild = '' + export OPENSSL_DIR=${lib.getDev openssl} + export OPENSSL_LIB_DIR=${openssl.out}/lib + + export PROTOC=${protobuf}/bin/protoc + export PROTOC_INCLUDE="${protobuf}/include"; + + export SQLITE_MAX_VARIABLE_NUMBER=250000 + export SQLITE_MAX_EXPR_DEPTH=10000 + ''; + + postInstall = '' + cp target/release/libquery_engine.so $out/lib/libquery_engine.so.node + ''; + + # Tests are long to compile + doCheck = false; + + meta = with lib; { + description = "A collection of engines that power the core stack for Prisma"; + homepage = "https://www.prisma.io/"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/development/tools/database/prisma-engines/no_tests.patch b/pkgs/development/tools/database/prisma-engines/no_tests.patch new file mode 100644 index 000000000000..fb88d92e485d --- /dev/null +++ b/pkgs/development/tools/database/prisma-engines/no_tests.patch @@ -0,0 +1,459 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 1070c7a30..310f7302f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -479,18 +479,6 @@ 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 = "block-buffer" + version = "0.7.3" +@@ -706,19 +694,6 @@ dependencies = [ + "wasm-bindgen", + ] + +-[[package]] +-name = "console" +-version = "0.14.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" +-dependencies = [ +- "encode_unicode", +- "lazy_static", +- "libc", +- "terminal_size", +- "winapi", +-] +- + [[package]] + name = "const_fn" + version = "0.4.5" +@@ -1011,24 +986,12 @@ dependencies = [ + "uuid", + ] + +-[[package]] +-name = "dtoa" +-version = "0.4.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +- + [[package]] + name = "either" + version = "1.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +-[[package]] +-name = "encode_unicode" +-version = "0.3.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +- + [[package]] + name = "encoding" + version = "0.2.33" +@@ -1114,18 +1077,6 @@ dependencies = [ + "syn", + ] + +-[[package]] +-name = "enum_dispatch" +-version = "0.3.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e" +-dependencies = [ +- "once_cell", +- "proc-macro2", +- "quote", +- "syn", +-] +- + [[package]] + name = "enumflags2" + version = "0.7.1" +@@ -1261,12 +1212,6 @@ dependencies = [ + "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.13" +@@ -1573,15 +1518,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "html-escape" +-version = "0.2.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d64794b2265e97e459334ed47a7b7369ce8e8ee3d3450c0c363a0b563fc92233" +-dependencies = [ +- "utf8-width", +-] +- + [[package]] + name = "http" + version = "0.2.3" +@@ -1744,21 +1680,6 @@ version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" + +-[[package]] +-name = "insta" +-version = "1.7.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4a1b21a2971cea49ca4613c0e9fe8225ecaf5de64090fddc6002284726e9244" +-dependencies = [ +- "console", +- "lazy_static", +- "serde", +- "serde_json", +- "serde_yaml", +- "similar", +- "uuid", +-] +- + [[package]] + name = "instant" + version = "0.1.9" +@@ -1804,34 +1725,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "introspection-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "barrel", +- "datamodel", +- "datamodel-connector", +- "enumflags2", +- "expect-test", +- "indoc", +- "introspection-connector", +- "introspection-core", +- "migration-connector", +- "pretty_assertions", +- "quaint", +- "serde_json", +- "sql-datamodel-connector", +- "sql-introspection-connector", +- "sql-migration-connector", +- "sql-schema-describer", +- "test-macros", +- "test-setup", +- "tokio", +- "tracing", +- "tracing-futures", +- "user-facing-errors", +-] +- + [[package]] + name = "ipconfig" + version = "0.2.2" +@@ -2178,39 +2071,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "migration-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "bigdecimal", +- "chrono", +- "connection-string", +- "datamodel", +- "datamodel-connector", +- "enumflags2", +- "expect-test", +- "indoc", +- "migration-connector", +- "migration-core", +- "once_cell", +- "pretty_assertions", +- "prisma-value", +- "quaint", +- "serde", +- "serde_json", +- "sql-datamodel-connector", +- "sql-migration-connector", +- "sql-schema-describer", +- "tempfile", +- "test-macros", +- "test-setup", +- "tokio", +- "tracing", +- "tracing-futures", +- "url", +- "user-facing-errors", +-] +- + [[package]] + name = "mime" + version = "0.3.16" +@@ -2517,19 +2377,6 @@ dependencies = [ + "socket2 0.4.0", + ] + +-[[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" +@@ -2773,18 +2620,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "parse-hyperlinks" +-version = "0.19.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9dfd153802fdbad158c1dfa2c5df806a86955ae6e07758af642a4faaa03310ff" +-dependencies = [ +- "html-escape", +- "nom", +- "percent-encoding", +- "thiserror", +-] +- + [[package]] + name = "pbkdf2" + version = "0.7.5" +@@ -3388,72 +3223,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "query-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "anyhow", +- "base64 0.13.0", +- "chrono", +- "colored", +- "datamodel-connector", +- "indoc", +- "insta", +- "prisma-value", +- "query-test-macros", +- "query-tests-setup", +- "serde_json", +- "tokio", +- "tracing", +- "tracing-futures", +- "uuid", +-] +- +-[[package]] +-name = "query-test-macros" +-version = "0.1.0" +-dependencies = [ +- "darling", +- "indoc", +- "itertools 0.10.0", +- "proc-macro2", +- "query-tests-setup", +- "quote", +- "syn", +-] +- +-[[package]] +-name = "query-tests-setup" +-version = "0.1.0" +-dependencies = [ +- "async-trait", +- "colored", +- "datamodel", +- "datamodel-connector", +- "enum_dispatch", +- "enumflags2", +- "indoc", +- "itertools 0.10.0", +- "lazy_static", +- "migration-core", +- "mongodb-datamodel-connector", +- "nom", +- "parse-hyperlinks", +- "prisma-models", +- "query-core", +- "regex", +- "request-handlers", +- "serde", +- "serde_json", +- "sql-datamodel-connector", +- "thiserror", +- "tokio", +- "tracing", +- "tracing-error", +- "tracing-futures", +- "tracing-subscriber", +-] +- + [[package]] + name = "quick-error" + version = "1.2.3" +@@ -3469,12 +3238,6 @@ dependencies = [ + "proc-macro2", + ] + +-[[package]] +-name = "radium" +-version = "0.5.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" +- + [[package]] + name = "rand" + version = "0.7.3" +@@ -3922,18 +3685,6 @@ dependencies = [ + "syn", + ] + +-[[package]] +-name = "serde_yaml" +-version = "0.8.17" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" +-dependencies = [ +- "dtoa", +- "linked-hash-map", +- "serde", +- "yaml-rust", +-] +- + [[package]] + name = "serial_test" + version = "0.5.1" +@@ -4028,12 +3779,6 @@ dependencies = [ + "libc", + ] + +-[[package]] +-name = "similar" +-version = "1.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec" +- + [[package]] + name = "simple-mutex" + version = "1.1.5" +@@ -4372,12 +4117,6 @@ version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" + +-[[package]] +-name = "tap" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +- + [[package]] + name = "tempfile" + version = "3.2.0" +@@ -4392,16 +4131,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "terminal_size" +-version = "0.1.16" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" +-dependencies = [ +- "libc", +- "winapi", +-] +- + [[package]] + name = "test-cli" + version = "0.1.0" +@@ -5094,12 +4823,6 @@ dependencies = [ + "user-facing-error-macros", + ] + +-[[package]] +-name = "utf8-width" +-version = "0.1.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9071ac216321a4470a69fb2b28cfc68dcd1a39acd877c8be8e014df6772d8efa" +- + [[package]] + name = "uuid" + version = "0.8.2" +@@ -5361,18 +5084,3 @@ checksum = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e" + dependencies = [ + "winapi", + ] +- +-[[package]] +-name = "wyz" +-version = "0.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +- +-[[package]] +-name = "yaml-rust" +-version = "0.4.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +-dependencies = [ +- "linked-hash-map", +-] +diff --git a/Cargo.toml b/Cargo.toml +index 2411986ea..2eb2bb82d 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -3,7 +3,6 @@ members = [ + "introspection-engine/connectors/introspection-connector", + "introspection-engine/connectors/sql-introspection-connector", + "introspection-engine/core", +- "introspection-engine/introspection-engine-tests", + "libs/datamodel/connectors/datamodel-connector", + "libs/datamodel/connectors/sql-datamodel-connector", + "libs/datamodel/connectors/mongodb-datamodel-connector", +@@ -12,14 +11,12 @@ members = [ + "migration-engine/connectors/sql-migration-connector", + "migration-engine/connectors/mongodb-migration-connector", + "migration-engine/core", +- "migration-engine/migration-engine-tests", + "query-engine/connectors/query-connector", + "query-engine/connectors/sql-query-connector", + "query-engine/connectors/mongodb-query-connector", + "query-engine/core", + "query-engine/query-engine", + "query-engine/query-engine-node-api", +- "query-engine/connector-test-kit-rs/query-engine-tests", + "query-engine/request-handlers", + "prisma-fmt", + "libs/datamodel/core", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 965c9f1ce8a8..12d312b657a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -302,6 +302,8 @@ with pkgs; mix2nix = callPackage ../development/tools/mix2nix/default.nix { }; + prisma-engines = callPackage ../development/tools/database/prisma-engines { }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; From ca4e1d109552ffb334a5d84e4d426cc975124175 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Sep 2021 10:18:43 +0000 Subject: [PATCH 74/95] CODEOWNERS: add myself to lib/systems --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index aac92be3a4a0..51bda5f04385 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -19,7 +19,7 @@ # Libraries /lib @edolstra @nbp @infinisil -/lib/systems @nbp @ericson2314 @matthewbauer +/lib/systems @alyssais @nbp @ericson2314 @matthewbauer /lib/generators.nix @edolstra @nbp @Profpatsch /lib/cli.nix @edolstra @nbp @Profpatsch /lib/debug.nix @edolstra @nbp @Profpatsch From e079a9b46d37184d5b2a79f452310069dad2672a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 Sep 2021 16:57:36 -0400 Subject: [PATCH 75/95] nss: 3.68 -> 3.70 --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 2df6214ab091..fc17bb8e8c55 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -27,7 +27,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.68"; + version = "3.70"; in stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0nvj7h2brcw21p1z99nrsxka056d0r1yy9nqqg0lw0w3mhnb60n4"; + sha256 = "sha256-K4mruGAe5AW+isW1cD1x8fs4pRw6ZKPYNDh/eLMlURs="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 21c5ff7850dfbaa002f47297960436cb98cf8dc1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 Sep 2021 16:57:55 -0400 Subject: [PATCH 76/95] firefox-unwrapped: 91.0.2 -> 92.0 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 70b8beb6fcea..5802a339baf5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "91.0.2"; + version = "92.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "82084799524db6661d97d9942a01ca9edec2fae6b503c9dd2d79fca78bfef4ee0a888e5f5cf4cfa2b91d9c9392658bb8218bae2b9bec0fbcacfe73a174a4dbe7"; + sha512 = "1a73cc275ea1790120845f579a7d21713ea78db0867ced767f393dfc25b132292dfbb673290fccdb9dcde86684e0300d56565841985fa3f0115376c91154ba8e"; }; meta = { From 0247d6f9228789ee440d89ac60c3dd81d80e64c6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 Sep 2021 17:04:01 -0400 Subject: [PATCH 77/95] firefox-bin-unwrapped: 91.0.2 -> 92.0 --- .../browsers/firefox-bin/release_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 20f0a0f64a6a..773393287aa4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "91.0.2"; + version = "92.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ach/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ach/firefox-92.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "f33d2815c214fe8961aa98d3d531bc91a548c4744fae551663fe78a087168798"; + sha256 = "f2ad99def0a6c2f778d96350b9a9db8d029cba7d6a21103f8c728f05a4143036"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/af/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/af/firefox-92.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "1c9c01a01ca6be5f43477345289f67caf09651ad270b7b252a295a671de817e9"; + sha256 = "032fa343964a31cc31953a8b39be52e2328c06e2d0d37bb25dd99c2b6a286a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/an/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/an/firefox-92.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "9ec5c6b14231d52056388ca8a7380954bea6cd5281e415c0854a49cc73640806"; + sha256 = "65a99d7af2c738a35cd9a32aa73537fc39c03a49ff8c8bc79b2434c2d73fbdcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ar/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ar/firefox-92.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a45e1e427693f8196bb21aa488c6524c35e84874a32413fc0700c30a7301b050"; + sha256 = "37cf6f24f2d89373f5cc03969a1584e0eba8602c9720bcd9cb83510b00c37d9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ast/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ast/firefox-92.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0d7045894345c84e5eabd42ba9e9c8e8606aba2980893485662e9571c3779f2f"; + sha256 = "250b48aa826b8487c2a0318bd4aefa769a0e5f1ccacd3c960db76a34b8541d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/az/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/az/firefox-92.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "298562a8941641463f728522c70ebde8e8380836fc0cc8311eec52dca5ec51f7"; + sha256 = "2cd6130a3097510b0a88d71e03f902b355acb5c54b04c54fe744f02082e9258f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/be/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/be/firefox-92.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "0e993e8678d0c2bdfa4499ceebfc0840bfd2ddd83c8c8e72d46d6d0c553c6819"; + sha256 = "1e6c1e3281c831040c26fe690e193eee32e04c04755776f1d5d02230aa4920d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/bg/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/bg/firefox-92.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "03381a727b1610aa9901bdef0325c58103ce7772561a65f6943c10cc4ba9d716"; + sha256 = "248464ee16c46a948771977a15e0740d75a4023ac7b1381caa4ab89e8854ce50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/bn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/bn/firefox-92.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "1802540536f260157be20865ef10c829917ecf4fa786a640f5c1ae3f5d32bf8b"; + sha256 = "22872587d0bc7cb548032163c0944b85d60f44b8b3015cd9445a1d249f226897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/br/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/br/firefox-92.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9a236a56179b5ce0aad809a85c744762c44daac465c527883157366b5037971c"; + sha256 = "5ce3b39bccf4557b726518addd963511b3184b2a5776422d470baec0c0737c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/bs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/bs/firefox-92.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "bdcd9e29bb472d1519d480288709ccca8ff625b6ddb3a251d526a6cd5b68122f"; + sha256 = "3238ff9f73f0a13b1716d678594b051e02992813354c880144df1a442cf2bbe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ca-valencia/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ca-valencia/firefox-92.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "7df5d82aac797456b4f22fdc9ab6f4114d7ad038cc16f28f83daf2d62a5b0f5a"; + sha256 = "305e8800fe2760a9aed35d26fecdbf39be310633e45410d46f5e78414ee7c977"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ca/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ca/firefox-92.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f05391b0bcc16fb1a39710c70bd33b79965c7b0afe57e593c04e00c57e1ad447"; + sha256 = "de25616de4e2a4876309de99736db900114d9b3d2785a022eef5d4bd205f463a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/cak/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/cak/firefox-92.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "afc0e6676fde094764ad466b735c887a31d5ec808237cedf7ac54b8323c2fb84"; + sha256 = "348a4320ebbe14c115a419a092f73d43876b55a4788380e9145aa2d0a5bf4f14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/cs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/cs/firefox-92.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "87a144952d612aa03998741a3232d93484200410d871c1823a4017e98b1d0570"; + sha256 = "9272de8867d1b590bb9912f8104e59e942463cf6aa2b47e46cb3baaa117bf62b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/cy/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/cy/firefox-92.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5f891c275890f746dee7f8dd27f69d610007fa553e23eaaa2bc949998b1b2d4c"; + sha256 = "32562b809a715a12074b0467d14a1deec0f3b48d1d2b4fe90a18d00b0ae05298"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/da/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/da/firefox-92.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dd36c8b04d729e6746c01fa2de7f818c09dff7d75339fd4234f4285979f4a5cc"; + sha256 = "63829b7a279e2eb8e43ba374c589ec3ac65a4a5de46bcc55df757b2f9f0fdd60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/de/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/de/firefox-92.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1f02ed10313352cfc8db46bc888c25da9cd61656e022e1a3260b42a56b1142e7"; + sha256 = "c62aa20c3b3f8eb2462fe157872196fc01fdba14e19e2025a1c04887a14741ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/dsb/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/dsb/firefox-92.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "f53ba888cf993452761ffb21647fc47c799a41c398a28c3546ffdbc9c10bfb56"; + sha256 = "84667669ece60081417e597cd00c5db9f25df9c3bce3b72c37d660aa2f9e57d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/el/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/el/firefox-92.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "4ec5b0b831ad161d501169f650c17715f6a4d505507c458e68cd74dae8aebb7e"; + sha256 = "33646c69fd8058dab93d685ef525b9c159e6161704b497f00553a9c9900713d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/en-CA/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/en-CA/firefox-92.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f07cb785234979806c03ae15e308ad72e417268cf4d9b3081ccf0c79d99a1b26"; + sha256 = "130a04cbb4bd463f39de36392d1d3bf465974ad866069b3eb7a1ac65c6e7ca8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/en-GB/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/en-GB/firefox-92.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "de25d50a780d8edc070a10b2ac7e5806814548a2ab3609e0e4f30eb2e0e18272"; + sha256 = "51839c5b3bd7c7ab471c44001318f09c0ef5fc9e82131308646adaaffca5a50d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/en-US/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/en-US/firefox-92.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9eaac9c88ff4696228292590b65ab2fd1b0d98b7a1edf5a21abc11b7803a046d"; + sha256 = "29050d18670a61585b101f8fa4e196fcfc22d0447178143202301836f3c048eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/eo/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/eo/firefox-92.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "cb11d5f6f3caac78bb8a06dd3ff29ee11b71dd159dcf8804094c0bd969864b9b"; + sha256 = "155e7fa1b564bec8cb11fd12efcfd9438be986e05fae2e978251d8baa7642c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-AR/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-AR/firefox-92.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "849fba4b1375e0426efaed3ae637d9de4c6389c36869b345715a846a87b2473f"; + sha256 = "524f2abfb48663f30d92cd3da01be180ff13a182aa300f31beab3ea996ff3e92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-CL/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-CL/firefox-92.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "06a43322ad648c1e8c0cec8ee0a0e087c795e23fb8ef5e1e9775b009e5784673"; + sha256 = "ca79ea7d15fd829845e9bccb28ff366ea2c8dd023026e16c05adf076015ba46b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-ES/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-ES/firefox-92.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "cc0bf296b910773e7c5d58760149b2918ee35c0d7c0f9953d890bbb6ace8397d"; + sha256 = "0a31b2fc5719d46567795f4d49b0655923adee804c117d83915d8ad61dbf01f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-MX/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-MX/firefox-92.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "7dbaba5d426891452c285a88f557ebea9eaded970aae22d5deb530a8bb30785c"; + sha256 = "f9f4e72ac67247466539ed3c844748e34e85f4b9ba28123e9eba55fa5f845fbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/et/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/et/firefox-92.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "b57651dfa1630d2bb202659a8621772d0ba9f2f5b111384105ae7db2db7e1c9a"; + sha256 = "4a135e194c889b4a655c846e77d7fc7dc18faa9e1564a9ac9107ea492571bebb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/eu/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/eu/firefox-92.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b1a3f24309807f139dae331efa358e605fd536188bc04e39e8a52669ce5d4925"; + sha256 = "9bf92e2872590cc6879fb03885e8a89d0325696d1f5269d08b7469e384ce3134"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fa/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fa/firefox-92.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "ab5fc5668be9ebb9b55b29aa245382f054b088d6920e58e40fe001e4d13b10cb"; + sha256 = "5025a2eb60cb136e1aee6aa846a15577bf95cb870dc30c51b6b79b5de01b3594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ff/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ff/firefox-92.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "d57c5e4a4337b49e22c9c010c218e0e31b19a9bbf4ef47c1c68c36415ef03793"; + sha256 = "f20436867ecbf73bb2262645bcb7b566173bc7975a46a3d7fa74718ce9f1fe6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fi/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fi/firefox-92.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "93cdd41f76160ec2d2286e37ab1745bf7e88a8c4d46fff427bea3468f54b3772"; + sha256 = "4e8a5ca31f6dce0891b24e03b54c0fa3774f9bba5e99b90d73bcc5cadc20b12f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fr/firefox-92.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "04a7ea5dc8576fdfd49156693fd7fcecd1c55ba33a655f6dc832bb22caa51a5a"; + sha256 = "5e4d6b7d4f654b53afb2d6dd32291feda2a06fcd8d30a0fd8580a81e12716015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fy-NL/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fy-NL/firefox-92.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "24a5acb50252bfcfde2c6ba24949cc06d9b4b2883c3a00178b25dd88f057b9c9"; + sha256 = "3ef484bd72bbb0d4ad75d42d052e26e1da50f85e7bb124e3f7a02e96ba06d837"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ga-IE/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ga-IE/firefox-92.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "136b45c8a0f9197e7e02b973b11bfc25d12202fb4e26b8c0e0ce1be4c19714be"; + sha256 = "45cffb030cb8a3efe85eaee32b97d3b995b2ab0c8a5b943cdade38bc39bf6a0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gd/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gd/firefox-92.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ea674cbc970610827f731f8c8ea3086f6f30cbd4167c12c471f6592c89892d3f"; + sha256 = "9cc69e735cf67da632ad1765853224a7b442883c023bd45d87cfd5f1a90e06e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gl/firefox-92.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f8bde4cb07aab6e7e7c776377a954680184bf3d3ecaf7542fc3843099854db41"; + sha256 = "567e290d2e6a9b09db3d1b0e33ef5d88a9db2b6ab8cdfc1ebf6619327b030a98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gn/firefox-92.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "845c2c94a5c3432148df173e9e5e3fe0308fbf58577da2b9d8753cedff80c2d3"; + sha256 = "bb39c07acc3bc89d7c36a121b701776793f391c05f011087367da6ac7a3f82cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gu-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gu-IN/firefox-92.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "9cfbe57f0e0bc2f6ca070f248403b3edb36637bb2a0fd01bd621f97928378463"; + sha256 = "4bb13592ece99d0f3baf0fc2ea0e4017ae5f14f0099baf4b17a83505ad811ad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/he/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/he/firefox-92.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f561c12266a3b841ccc72592caea6410b2607140b9adbb66e067377104c4bdb1"; + sha256 = "ed666bd6e000d232b7c0a2e7e1c236c4cdbea638fb6327a23629be033093ab11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hi-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hi-IN/firefox-92.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b5cea26bbbc6fd5cda63f9099f17b50dc61697c1c3a1ea07344aabdf2ad154ab"; + sha256 = "0e48dbbda7854a54465ef78c194c7c5d1dd7f3c5609ccee92739a1245e625f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hr/firefox-92.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "aa3bc54890eb5f50a51da981576d77ff89480ac52d1056fecba7c3d699f2ec49"; + sha256 = "9ec220bfbb0e8e1c745c89cf9e7ca4349d70ecdd9ef343fdedf8a477dd33f582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hsb/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hsb/firefox-92.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1a07e8e22747ac148d8e9e6c9cb5f23466dd821ee40375d6401d6199e615a757"; + sha256 = "23ec07f1307a41791b0a54f3160779ae10e91ab051a1a5353a2f1b97f1495468"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hu/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hu/firefox-92.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2227a72fb5caa0f95782f19380c60890b0886469207b03bcda9d6ab090f87b29"; + sha256 = "101367ecf8df3de940bb672280569ad861cfdb17af8bcb393f9c9a7877e577d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hy-AM/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hy-AM/firefox-92.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1cbe3aa9306de87b819c04197e769958be6aada5a192f83decbbbd9b9874c73b"; + sha256 = "e340c664894abe8b6ebb95bf8e9c0a800f19d7fcec82325a6de9a592a00a6ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ia/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ia/firefox-92.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "283daf5d143c70a416d6286cf51d7657d4d3e3785085ae574d1100cf24e40525"; + sha256 = "cce244fe4b5387f567655f974862c3df5e77398b0803ae43eb60dce42f4614fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/id/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/id/firefox-92.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "3cbe27d43c810758aabb755f5745912d92b9e843a294b938224665de614612cf"; + sha256 = "a094a09793400eef4990aa638e50a2d894e434e568c2c00491a6ab444fe1a9d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/is/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/is/firefox-92.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c3a3d505efe0a181fb1c3002c19fdd6669aea41c9b31382cf9679c53fcd0e3e1"; + sha256 = "10e7a8689abf2ae940500d3562c21c3186883c6a8477c012b60d56c856fe0226"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/it/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/it/firefox-92.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "12a3edb320a2aee0d872aae1180f3b106f2f3a68c80ce6137794e00fbd0d09e3"; + sha256 = "9b5c5ff9c7a52a1b58e31ca44bc993d31d42ed4e2ef697847391559c0986c5a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ja/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ja/firefox-92.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f5b7fed8385b9132ca458983cb7ad926d453c7d62309994ee7ec8c79b653ccc9"; + sha256 = "3e8d6c06f7e66409c1a17ceffb81a4127b496bcc4a4cccae3be731414891a8dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ka/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ka/firefox-92.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2db556fe388ec3e29d603eb90e1dc2aa3c0064f09f8a6ad48158b0255433d0df"; + sha256 = "2a0406c8205cc8de560f0d9c1dcee6963dbb2df67110ed54fe54821c82132bc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/kab/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/kab/firefox-92.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "fe0d1dbff288168c06501c2f2aca07f0de5a7ad6b1c9ee3ea9fa49a6bcc01f05"; + sha256 = "d6bcc16d8eba88cb29ab1985a717abf1e7835c01261e50f2d04bea9229327feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/kk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/kk/firefox-92.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7c4ea35acdfaf20155f68b96af3289e465fe9179d7eeefa5c231bed350ad6f72"; + sha256 = "ce6467027b132c8a56c5fa96e26140a11761c0a6b630ebf1b8d6d1ef8ef717e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/km/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/km/firefox-92.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "09f9246eecc557ea89159ed67c10ffb640cdb4877e7bd3e76a70f429f80d4c7d"; + sha256 = "2af10a5004835e32c6ec579f621f7a2daa58f58f6eee831fe65efae0a2b6e5b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/kn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/kn/firefox-92.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "df48636b12ef91f18c837e42beba979d83e0a0f5d25de5593984d19c6a3572b1"; + sha256 = "272821a500af703c960d2d9ff18347616237ecf7340fef39f9a9897e807683b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ko/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ko/firefox-92.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "0d21181cf503a1b203c160c86a8fb322da5dc9a8bd6ad2b19541a691ca3a9ff1"; + sha256 = "a8b44dbb7744cf1c2ec25f9fc64b6fed1fc19aa06089dc503e648bfc449f78ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/lij/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/lij/firefox-92.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "e206101e2f05d297305aeff38becb141069fdbb7fd2b8274f150bb9bd8111318"; + sha256 = "e16be9d8119619328617e9c16a123a07aab4a4020eaae8cf0a8de1a87d9c6e58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/lt/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/lt/firefox-92.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "feee32cc11f81db93400d4e91104699e3968f01c09dff99fb7859ab09925833e"; + sha256 = "b3d3969331c25f74e65756b7bdd43a32234e5e40fed98597da073d0c67f96d98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/lv/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/lv/firefox-92.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "16b6cdc6e993465c81937bb07ed275a79c786fe77caac3d5c7e309de62698cdf"; + sha256 = "a588b619b832aff9850692c622e1b458bbd3f481f0e9c6d12290dcbf16a05c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/mk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/mk/firefox-92.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e7eb1e3b560ba558aa4e7db1883082279752db3580b97face685f16e541f3778"; + sha256 = "9aaa0a446703e06249e8c0ad56982962d34d5a59a9d25bd744377bb011014904"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/mr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/mr/firefox-92.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "18aefcd48300b1b8e7a3775539d8952341dc9f930cd4492aabf0f1c9b5db9251"; + sha256 = "7b889d5ace4d0ea80a496fa1d2e963c052e55d6cffc57b3e8f1d4088bc7b6091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ms/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ms/firefox-92.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2a4e8aa5f8fa123dec530c75db7733c7c02be47a854b1a83ca9c9de8999532e0"; + sha256 = "bb52c8b703cef9e25b41cd3d85974cce0a009a1d83a9a97b295de6bfcdc07959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/my/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/my/firefox-92.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "af73e4c5d7d07be9eef45bc4b4623e6d15158b8e195d2679aec57f5b4e5d4522"; + sha256 = "ed9f099d13f984e3ce3b8837066869df3861d5ebd6e6391ad0ded9a1db6bc946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/nb-NO/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/nb-NO/firefox-92.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d7f8d00411d40955abe40861cb9cbb6c286c4123e559a4f1a1cef14a16f9a7c3"; + sha256 = "c922d44b8e8a2355e7c6231d976e9ccaed02ebee0ab1d781b079dd2bd2a6d848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ne-NP/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ne-NP/firefox-92.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "1a944d38efbdffbafd3ff2ef7caec06a7b541e50f50288b599de6f84501ceb71"; + sha256 = "5192653edff514a71ca95aa24eacf5e56dc824a47ee47df5c25d42bfb6bf521b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/nl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/nl/firefox-92.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "3053667a9b8fbe9f450775ea4e16f42622a365b306024ad09efb94f0f78e1ec2"; + sha256 = "9c5fc26d06f1f57e7f9f97761abcffa864b378ae259637d37e8084322df549bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/nn-NO/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/nn-NO/firefox-92.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "778f005a86a464c96fb1cd6d558dd9fe268c4ea810356aa3bbcaf366ac6af895"; + sha256 = "85380878356b288976972c3fec4f393271975ba03a6541885676e13f78b0d1df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/oc/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/oc/firefox-92.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "831240b9be6aee190a4272ea759d09fa326e3693a6733d4a9e9c68ca701d1663"; + sha256 = "f538de12b1c43a112c4ac1eac24ebeecff59bb9b820913cbf70b01cbd7cbdf9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pa-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pa-IN/firefox-92.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a49344f367d80af4d6683729534c4133e2e30f6492f27098d626caeb609c13cc"; + sha256 = "4bfd146cd7b05bb4e63ebd035360c4b7b2fd1c6ea551cd400df5ac8c647a89ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pl/firefox-92.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7630e7e09eb0c9b83af6771337494ded1e97ab8e00cf38407fb2548b5751f566"; + sha256 = "badaeaa9c937ad7766aba52a1f7a67016d50bc0c8843a0d2fc866104e5245dac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pt-BR/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pt-BR/firefox-92.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "0404ec267d35062191f59de8971a7c348a8b48666b571f6fc83ac72da1b71d28"; + sha256 = "ce492dc058a636704a9483e82f95f102703136cd273f653e39f38ee8ef2381dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pt-PT/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pt-PT/firefox-92.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "939173f1bd04f71db95b3d526b03f8af9f5e543f969523dbc054e6b8fcd24f1e"; + sha256 = "2661cbca38cca08a504cd58a48b20623cbb87043240cf79a40530a315dbbe8ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/rm/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/rm/firefox-92.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4079c2b319fb8bbd53c060ac4fd3d92f7a275080efbaabcf3fb1753232d20a00"; + sha256 = "540351da416718343cab82f8756bc0b33a3a396377d27d02f1e9dc7e42e9db66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ro/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ro/firefox-92.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "611b34e2aede6d0da5269acb5973c7ba802e1c21f54f013c74900e685cc2f696"; + sha256 = "54b661b40ad66a5881a98d6c97fce50fb91542e677b7dc0be07f38c19e3927ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ru/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ru/firefox-92.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7f485ffb4db58234f09c86b03735469b9a6b0fe769e248ecb2e735f6d94e56c2"; + sha256 = "250fe6abc746a74a1e1c7be095f8766b193738eabd095213da2b6e41b4e9249a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sco/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sco/firefox-92.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "6578345753a4c043e3240aa0da35e6888fa51e91b85e08614e16ae6571ab256b"; + sha256 = "b14fd7e73b132fce408ad8398728c1a13e065bb8a86a37720cb3aa02bc7fb4b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/si/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/si/firefox-92.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "d23d3f09e7a5112e5b6d28d2b2c8c99f4c86be52f1e9422eb2fc3b1906d98ac8"; + sha256 = "f6427495f30297c38225e972090efd3f02242f70a7d47ff67da06f54d747da5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sk/firefox-92.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "90a116fee8568b6a9a55c0421dc6a2860d63ad08b8fc378084c1afd4c949c1d5"; + sha256 = "a59f87ac0ee93fa517347148be8f1d519df525d63424a93faf11b6349557bcfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sl/firefox-92.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "771b695988fbe0e12bce06a740e3495fa850c8868a05d67be50ba8090d4ebade"; + sha256 = "a86644ce8fa694fb6727488f566490f5cfd624edb556b94ff9ac6cd3506bd5b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/son/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/son/firefox-92.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "0a645ec3f2f57ae891aaecc2ce206487518175828f4fc340736b0ea72af001ee"; + sha256 = "b76724b86c8c82036b159baf9c376de3db0d9855a256060259a6800e62fefc83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sq/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sq/firefox-92.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b3c72f26cc4f14b621bc596c93561d7a117fd5efdbe01e4235aa1fb7c8f2d1ff"; + sha256 = "233d9bd22ddd0223c5f4d9f1e96caff90b4fdfc3527c8ca39f3da4aaa34918ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sr/firefox-92.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "36044733f7ee34fdea823253f66e7e8fa3cde8d429711ee91c128960f418ff8a"; + sha256 = "9b65446757e6438ff477df76de2c9a79c5300a40b9533df90715ad842365840e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sv-SE/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sv-SE/firefox-92.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "392930224df082d89c5bc1624f8193d985c82ec11c37d3ff9d659d339f1c1814"; + sha256 = "a9b76248c2e5043129c4b55da2cedb5456df556c8cb28a3f7814e4b99ed5a02a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/szl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/szl/firefox-92.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "8481c1d119e568ed109bb6bfd0c1f897f7f284852e24da7cd2db591a00ada4c6"; + sha256 = "532e51336b7ed703f4955ad01dbb030b19ab222f20bc44e5b224d24077d96537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ta/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ta/firefox-92.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "3a6e28128ba7f167fcf6c7bb238ac66a7095708e3abeaca7fc6d5ca7eabc43e7"; + sha256 = "1093e65ad6bf476417dd34dd44fcf97cbaa23bb897b71cb5c7b81a30e7bb38ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/te/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/te/firefox-92.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "1c52637dc10ea1fe3c1e7b136f64518c6a97e72d87318e0696b05f0eb25c27e0"; + sha256 = "99e4829264f1ec2ea00e3359db5f16113e30ad67d8e6f7b8611987f6c1ac5f35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/th/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/th/firefox-92.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "5fe6f59217a47989e79a3b05b23bde98d77e2a5b8c769e03e66e38976b39804f"; + sha256 = "fb7baf520791be7d45b197ebdd81886635328c986bb0d06ea69c2c705fcc719d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/tl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/tl/firefox-92.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "1128e69f29688da700f60832b9e87529f57d114ed944eec2f9209e7a92cfd790"; + sha256 = "1e8f5b75200fd25ad6e14f89d2be604bc724fb48d7cd15ee9b3adb2142a7d1f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/tr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/tr/firefox-92.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4e643963f6a1f34553c1fd896ddd58e97208d95fa563de56869ffe5f8e8e8f1c"; + sha256 = "ca3201648b93b16513f4aeeaf6decece145e86a36706d26a0cd708f8e1c17fb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/trs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/trs/firefox-92.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "ceb96b052b352fafcec29d0f301314187f7800765df4e013394508a2fca76159"; + sha256 = "559d792599c51ba20a78e2a8cd4d10b47ccd61ad334a2504966b388fd4165991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/uk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/uk/firefox-92.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "599f1a52b843d7f1a743547ad54294d95c1f8f73c0a91b0bdbc9c3de7991f54b"; + sha256 = "290f97c09de52f639cf9c9b7cd605cf29d1b6a3419915a021a42353f9848d96f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ur/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ur/firefox-92.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "be2aaf110942c218564aacc8318da5b317cc7546e70fbf0d0e47658196da9c6f"; + sha256 = "296d50147acf5e8564adedc1253899a5bf67d8db40eb46f8d7abb51d3dc8ad38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/uz/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/uz/firefox-92.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ef8811b53ce1cea99f068b846ff9e680cf84ad7bcdd30af45102340001cbc330"; + sha256 = "e53df4ca508cbaf49bae355fc08d1f37c90e99bd8629d3a4968e4905fe476b64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/vi/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/vi/firefox-92.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "42ef9e751790fbf138ac1d75e03406cfe91b11c6b4afdd2e3a1c5b3ea921f5ee"; + sha256 = "35189770f0e63c9b1f5623c4ef3bef4115179adeeec2d1c3b9fe7595bae63329"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xh/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xh/firefox-92.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "17b3c935627c14f51e1d7ad106ef8428aa7c7399952f87cb54d668336dcd4420"; + sha256 = "df7e4988bc574de22f3419f5522cae14a8b7b6c9cb32402e990fff92895fc34b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/zh-CN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/zh-CN/firefox-92.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "1bc2854070700f2899cd1cca848aa39d34394eb7c3853c4b92b693122deb0867"; + sha256 = "c9d10f3798510192c2a7e04c318e69a8f80945e72e7b7f81392d3f7f716cdbe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/zh-TW/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/zh-TW/firefox-92.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "9620f5ef16421a187d1f3e98c80d5e336995a9bb195241b8c413f619a0a8a3c8"; + sha256 = "22992234bae2f13ee4c22b3f75f69aff251ea466383f423398a062e400da21ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ach/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ach/firefox-92.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "68648f5e2060c9ba841284a6cc22a793e4a13426c517e803ce0ec21dee6f7792"; + sha256 = "316ca1559fbca9ad56be2ea53636dae960e05ccb3f50868df8baf427332b289c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/af/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/af/firefox-92.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b2e55deda95b5e3d180774f5f922ad223a45a7f4ae684203b77bb07937bc2981"; + sha256 = "2a7ff4409a50d76319fc4a749f516171fc1abe2a53290b4bef3f7dd87871d4f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/an/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/an/firefox-92.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "f0e5d4574213583ad8cea208955cfea48c0d0c2ec9bf5a62dcef18a20ddc04a5"; + sha256 = "dba4ce48f723ac4616906e7170e08aa14bff86def5f2e9edcbe4fa5bd283c4a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ar/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ar/firefox-92.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "1ab07eb8c327180c254061488c1ccfbbe3513657031508ee5658587437049714"; + sha256 = "db69d68b140702d595489d732c4f5909fede55cb4d5f81a91a12a7d769f96a8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ast/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ast/firefox-92.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b6bca0e8373a9f816b12f856ec0a2515531b02a5e0929a766f904ad2d65c9c68"; + sha256 = "92185bfe4198d9d4d3fe2146e6cd1ba23dfcd258933e393d2ed29dd2239e6f23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/az/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/az/firefox-92.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4e56f180d96ddb0acab3abedad6fee0709d41075901180123d7bd3cbfa76590c"; + sha256 = "62fd888cd6639e208907268290b0d7eac668480a131052924c978b5356da8ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/be/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/be/firefox-92.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "030df4c436f1d1335b16fdc523180b9eb4d1f78de95aafe2b06a5dd1a8fb72a2"; + sha256 = "41f4cc7bb3f8aea6059afd61ac7518abc32708271aed42eaae058fe17c3e7691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/bg/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/bg/firefox-92.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "bc595dbb2930838d60d5cc7455055469498ec645877d3212f3a08f433fe149d8"; + sha256 = "59e502d69afdb5a80d6a3de0afd16caef6e2b69e86cdd716f62fd4d5631312c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/bn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/bn/firefox-92.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "97fe8a049a0ca41475645171d829c19514a18320223b96a34870954a0526180a"; + sha256 = "20b3c1c5ac49607fe6198cd078e95882e1bf0efba4456b3d0b484519ad8ff2a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/br/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/br/firefox-92.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "abefc4181bbcdca83ac98be38e08dfaba67ebec48481bca356828331818ab530"; + sha256 = "c532e758f36f92bb06d0c9a9e99e121ea2ae8989a216334224d79303cbe9db50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/bs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/bs/firefox-92.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0e8e91da19070a5e5d283e0d3f513d01bc856ce5fbd304c9dbaa4fb3b077fed9"; + sha256 = "3b642ee6d1227fe4b459bda110285826a5f1d8d4ea32e30a9f043ac2f0d290bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ca-valencia/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ca-valencia/firefox-92.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "409b9e13038e26de3bf94e7a3a4d35606e378c9a4b07a6c51250a778f4f95cd7"; + sha256 = "1ffb6094c6f56c79c1032bd73b01335277c49988d37ff8be7767cfdcd5ddb0a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ca/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ca/firefox-92.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "9b983cfbc1a3a46f8277927a5ddd73ad236fd5e29542d3e3b23708242f2ae241"; + sha256 = "e70753a344a1b4bf1c95941495508de71a5c064fec7dba981fe123be48efe85d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/cak/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/cak/firefox-92.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b4a4450d741e5bd3bbc5087377bbe4dda26af6ea10af5bf6286c26d09d02f3db"; + sha256 = "f71978689dcb2040910b342ca69dc863b9d50881b8015667f0ea5e16e6730429"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/cs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/cs/firefox-92.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "d7dd456b77af0f5e98c55013e735140e578f81a402dcf0ab2b3971a9e1562ca9"; + sha256 = "7e98ec58cecce174b3a76550bc3c4e0efea5f49ed6270137697dbe3410232b07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/cy/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/cy/firefox-92.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "efee0853acfadd55dcc8a25e693cb7265a38c0ef29704b3eca0ba99036162f49"; + sha256 = "5c6b89f3ad3404ce5269c9da0ce5a2a827409f989146bad2ace80a93067ee0da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/da/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/da/firefox-92.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3835e498f68a75b31f4c6b13eced98ac458df5d3c1acfd34f44f8959388ec57a"; + sha256 = "c7f21ccb8478fcc0cc76d7895f8b4e18fb750d62f9d6a01101b106f436c015bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/de/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/de/firefox-92.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "47c3b1cde4cd2a1e57b63ec2e0f8db0e1b393c61bfb3337371764df835527daa"; + sha256 = "69cec8959bfcfb1103097657980b9a40b946fe7fe61c93c8fe78aab996a2f30a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/dsb/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/dsb/firefox-92.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "8f3672728a49391be310bee1bfa6336735874369cd427d4f7073f833ddf54626"; + sha256 = "568d38d8650fa65d258db761c19396da66110588b50be860a107675b0420715c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/el/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/el/firefox-92.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "df6ded8d5abfb6f33c22c34578a3b12e991c1f64674a2b4b573cd1c682779400"; + sha256 = "b3567a5124db9ff3aa6878bcc24f4f484c73ac2bbf928efcbc8d5cec50acfcf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/en-CA/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/en-CA/firefox-92.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "df5e90395044ef348d766fc9ef4792edc20b8befbaef0cc42794eeace47a0a9a"; + sha256 = "aee0ffc689d817fe539473a5164b6cb0ad9a6bafa23282af56fd87743261365f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/en-GB/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/en-GB/firefox-92.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "eec39ef04bdc398fd9f6c2eeddcc4e8f85e46ec08be8f53e64564e41d39e111e"; + sha256 = "528c966c67582b5bd96e0e6ca911ecd5a30988237bb7d93d85dbb2e5979c0301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/en-US/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/en-US/firefox-92.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c52d82b5a73e37c5c80ccf4e206bb80b632bd835968e6bebc7b93c5f4a5acfc9"; + sha256 = "3fbb43fa7e8f1636a5c9be13af710dd5b3ef5326803b1fc35634ef68cb8db531"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/eo/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/eo/firefox-92.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e86dc36a4b14563e546e218589d74fe669083111d97df40b2ef35ad48d2c7309"; + sha256 = "62de83dc9b666f1699302754676b5657e587203c49ab71ff925657a73c53ad5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-AR/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-AR/firefox-92.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "891374037a1093cb33739e55188b5fdfc54ecf3f9bf95d3eb9f700d388bc9632"; + sha256 = "08d8aa305344ea45256dcc7c574c9a8fdd5e44e7ea889a1ea4e6af17eaaa09ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-CL/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-CL/firefox-92.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0063ed2e227e579591f1b7fc4c7d9acdb6667323d2110e4605402021eea117b9"; + sha256 = "41fbcf2947e91b50b5467f7341dd02be42b71240414b56aac651d6ba7f53e74b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-ES/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-ES/firefox-92.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d8b20f06f8caa991596222ca189660cc3b4c3fc86148d85d26223425c270c4df"; + sha256 = "e180d0e363ea6fdc4f2fe7c727c5958d33b42c27267b05b31928ffb5799a06d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-MX/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-MX/firefox-92.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8d87de0de6e6a79065f22fef7e17b5bda5fe5644160d37444a4144d26fd6c303"; + sha256 = "00ee74e5b48685accba8e37510742821a3a6ee993649429194dd46da63b553f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/et/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/et/firefox-92.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f65daaa770f2a0f0f7470b4f4ab6db20d41f107afb3431b2b08ebffb45cfcc6b"; + sha256 = "430c623e3b855dba5f13173031ebce68079f71394194cec5f60cacd6a2e1c061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/eu/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/eu/firefox-92.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "ff1cc7c354dcb3ce8aad5080bc88b33a4282fb678f888a8bde8bd5d8eb53867a"; + sha256 = "9e056cd390cd72fd3cb75f6c704b36798c835fed3eea46d44cd036c6d012b18f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fa/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fa/firefox-92.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "71cc81129e19253a465f3fa1a5cc22795c9496f6f4e063b39cd5fb4f8504e7a2"; + sha256 = "5ab4507f0af10790e4df3f4caacabeb9ce01e82b9b002791a1102193492f7c1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ff/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ff/firefox-92.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "b2e919a9379d24ce148ac5b1ac5dc498693f3a8f502b24479fd0876403c1567c"; + sha256 = "031e7de2b235aa06ea74850506dd241621548032fb65fbb27b3389d557271e9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fi/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fi/firefox-92.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "cd1729d0e2885304ac6f6fdb4918617f4614754932885ec43f0b9988d647cf3f"; + sha256 = "d3f30254a4afef69da5dc59c6f77c48eb801f402e40bca9f2e97ad69d7dedebf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fr/firefox-92.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e06c6d6b2e2dda4ec6c3d12798ec2aa119395e9ac252ee5ea8626024810d05f3"; + sha256 = "7e4063d25aba375375c6ef1749ddd6a49fe616ba2b293cac9220bcfcefa936f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fy-NL/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fy-NL/firefox-92.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8f6db800766e9c3e6baaebd5ef5c32fedc3d478837cdb52e734dd9b948587696"; + sha256 = "edf12cb878e8014402c8249c89fd648a0dc5ddf5621d9ee4f92694fb92b5a6e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ga-IE/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ga-IE/firefox-92.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "25cdaaa65a20a41e6a1918539106ab5a5c788e24f6afcbc6458bb57faa667948"; + sha256 = "9d7e464620bd62e81ce62fa6de176c614a8347cd2972d8ff96f3b6c7ec893c42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gd/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gd/firefox-92.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "560fd9ee5c8cdbb080207793bd14d6d9502a873a2a2b06fa447bf290f30391b0"; + sha256 = "5c48eeefa57989c23810fddf8a63c0ab022e7774050f9e69f3d0abece64a7b33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gl/firefox-92.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "4c4bba4dbda0515ac035ee2c3878866ea3f6cb01204f761dd0c356bf95c3c238"; + sha256 = "eb1904437e14194c672e8efc493e08490b8660220ad4484fbe827d4e6c36ba11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gn/firefox-92.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "71d364c0113dc2e6d39347e898143f04b176a28ec69d19a0061737b903a06f80"; + sha256 = "1018ee1a262a44138a54f61c9755a42fd8fcf894466bc8f6ee63fd3db95eb08b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gu-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gu-IN/firefox-92.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "9a9c106439dcbf7fcfb19a0af682a3a9e755fc568a571c738fb4e385f009a392"; + sha256 = "63b248a8f170066cb27858a239da41c08d3bd0dd31f49c0532f47dd3b8531cce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/he/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/he/firefox-92.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "4d0aabd64820d3e2fca5f7de902a03aed79a6b4d38c4a744cb463d6814b14df9"; + sha256 = "fa1db5d836aa3136e6051fc3a378c9ac7f6750da680e6581af1018f8f20e9c88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hi-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hi-IN/firefox-92.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "17d92c11c08c164839d9f959c81847b300cfe2542e48e7bd259cbd59b6be3ce1"; + sha256 = "d21f6a1a4edb24aea217ead940a41846a12de5004dcb8bc1145807ee32a08998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hr/firefox-92.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f22b580069c1ad3b5e29e59a2fe0e19b7e6467ae6ce55a3ad34b8ce27a1680bf"; + sha256 = "5e2fbd3e80787a8a2aad7f7324fe4d0b508bde79efe22ec0aad7f10e02db15ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hsb/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hsb/firefox-92.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "2feb509657b6889eef6d5398468987c2ce06972f25b4c0efa455be732f2d2793"; + sha256 = "3698ae1adffdac77fb639d80114eeae27241a535f8cd248432256c4e7ba923e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hu/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hu/firefox-92.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "31c96f8f03df5f128146ff071b25ea0ed13f217eefeb061f9a8bd083d5f0faa9"; + sha256 = "bdda2cffd94bfbb86311db1df2f70693717c37938dc5481ae4d4ff961b1f123e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hy-AM/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hy-AM/firefox-92.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "3cae4b4ce1aaededb6e1657b4c608967fd7b502fd1d5d73fd8721aef9bda1f67"; + sha256 = "8e03e849a5fc77ccde394f48e752c7b38d791edc748679fb99149c9ec55cf114"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ia/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ia/firefox-92.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "048d341b1a3f95b9a131297a5473ccf2d056e8312ff2dbebba41d0ee6159cdca"; + sha256 = "da963fe2f9c5f739c75e0676a588d49bcc5f55e46e502f7c8fc26962e3f6b50b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/id/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/id/firefox-92.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3110e13e4552b1826cc842d241668f7070898657610613c446c4bb0ce231af7d"; + sha256 = "7053bd9321bbc81e2d8c0ee44d5bae33dc61658ab98de9dc9151b23af775ce2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/is/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/is/firefox-92.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f4c929aabe2ed2ac02591f4fa556286c51aca294aed93d9db8b29b5e960c16f4"; + sha256 = "796332ab0dc70589fa719f9c43689474e6a4c4253a0334c3fcbec5ff46817a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/it/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/it/firefox-92.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2ce8cc3cb29f5db5701fe54b318c501c4b967c877b258524ba648ac3ffe89e23"; + sha256 = "78b42d241584443d2bb92bf0c35a5616bf291f10ee8912eae7d729d3c51fdb95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ja/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ja/firefox-92.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "2bc50a7af5f03393ec0f83fc7eb4ed8858d2c005f9122cc8f3e8a377f7e8ba50"; + sha256 = "9ecf782fabd96dd5e39a36b6fbd59d0ff0532107cb3e91d97857fb360f2cb00f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ka/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ka/firefox-92.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c806da6a0d3c2039d5551f25a3a4c506ddf0a2edadac4dee220040693b9547ff"; + sha256 = "17d7e4467fa606abbef19fad5eb22e3fda9435eb897560406e36f9f52daff804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/kab/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/kab/firefox-92.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "769a5d8ea726d9a3477d9771302f4f3157ef314012733c31c4852bb4d38782fe"; + sha256 = "b06eb4fd02a68286dd12dd5a2f1708ee11ec65d0c96e151d9a4fcf676daf7b45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/kk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/kk/firefox-92.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "0dfb08c348c0be7bc9f1d8ad603081e360d1bef8c91082053edbea313b429082"; + sha256 = "0b4fea3f3f06f18cf407956d9e8f1cff7c5e9b3a262bfec787c8433ddda5b5cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/km/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/km/firefox-92.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "09441c111989e0655df16a870cd91a7f445157385e1e7839588ddf6f484eae30"; + sha256 = "fd0422c095fa662c622732f2347757c058653839a9e7d29e775a5132f555797e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/kn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/kn/firefox-92.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "442cda23ed74ff049963a244b3b31d4971b656b3324ea734e31b3532ff8c5d02"; + sha256 = "23da36033e71f0bfbde58d00ed47895ace26d5cb35f440fe97e6c8572f847f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ko/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ko/firefox-92.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "accb55d70f8853dd23c32a668f887105bdd924ea717f0b75a1dcc70f347a8f2c"; + sha256 = "27279269f97127826a46fda7401fb929194c5b04107ba08158cc9169f4a35a4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/lij/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/lij/firefox-92.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "77b93a3e83c69940033e24e30f7e78069e39fb086d45d29aa8452e298d4044fe"; + sha256 = "d718cff103154a25a5159e788117767e82ca4581733c61e68b5c04dee7f1e21f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/lt/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/lt/firefox-92.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "0ff4fdbbf1429bddb00236677ebc77fe6a344e509309f794e87a6d31ff1e34e7"; + sha256 = "d830090981e07344c714503b8cc37b6f2e63be4ee494a885542a998b56697ffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/lv/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/lv/firefox-92.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "212639e9ccf7f1e8b325b7bb71616d6afdee13816f7592f920d86a10de2e555d"; + sha256 = "d4cd8d44dc024d3d992b263f6dfd40ae52a22ddd87fdec6cbe092a739f723025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/mk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/mk/firefox-92.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "c9f262672128a6a1e7b7e789426d827e8eba5743ed412af337b0eb9bdbe13556"; + sha256 = "45e4d1d02724c91f26b39dd5ea9f789a6ae966b31f9a0fa784b3f40a41d0d925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/mr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/mr/firefox-92.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "075d22d57c9bcd32e5d2e3487c07e1da0f49a0532b2aeff4563d3ac771de2b11"; + sha256 = "d84e53481bfad44403f1de84845444fe40cc8a92345e8a01262d98c09f47ddbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ms/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ms/firefox-92.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "43d32b01e03f786afea4738b86a1df500840874b3226500b1fc3c6149c5824a2"; + sha256 = "905f8ec65500b63ae4e04647126871200520d3a8ac5d6deb79227794da2b24d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/my/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/my/firefox-92.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ebc3ea9616a9389c1c7fc922062205ad5a4f5a12edf5b440f618d215b77d0148"; + sha256 = "37b93b5d29772952e00626b70e1e1655b483dd6d800a8e5fd55613d3f7910c0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/nb-NO/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/nb-NO/firefox-92.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "5c33d8f9f6975bec07e3b7fecd30fad3d4b61886d0e35831517f383c08c97401"; + sha256 = "f2ecd7f0f4f53c8705181716297772e78d433c3feee17730066a31582ae0c7b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ne-NP/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ne-NP/firefox-92.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9aa9d913fc5913f4b45f208a5b81a4b5e370048861635ac67403035b6d91f78d"; + sha256 = "5104800ddab3310a0c21cd7fda903c822eae256622735469e845c6a169d9d783"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/nl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/nl/firefox-92.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "79da9079bd4b3e4f4f6578a0435aca36f49b28ad50cf8e251f02ef2885265d87"; + sha256 = "9c6c58ced571a0d044e8acbbaf8236d9de14df4378742086aaf4fd997c8b7509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/nn-NO/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/nn-NO/firefox-92.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "7a4f34f09f995bd71191690af56c7fc78312114988322f24071f9ba496804e20"; + sha256 = "9e2a1cbc3d235df91962e9835712e1a52bdc830bc930a8e577cd2edb8b47e8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/oc/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/oc/firefox-92.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c1e139347a48a19c6bded097e1b841e38005044904d6d5954e3b9a01ffeb8983"; + sha256 = "76da1a7f18f17a87c891252944bc6e2c2962b0ccaa450e1472e04ce5e1df2d90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pa-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pa-IN/firefox-92.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f8b22eb93e9f0c4882d5973ad1dde6e76d7a62139114c0a14e2aa1e12a89133b"; + sha256 = "60804014c94b3abb6785ce7da4f3036806f2ec378314a4b7cd61b3fd21e01365"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pl/firefox-92.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "b6f1b36c9ae6fe988dce91b5f1830a27e9f7317e4e97dfcd197b1991661543a4"; + sha256 = "f956ff3882125832feb630143ac335eb094c9e4c3102646487bd5e3a36ddaf8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pt-BR/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pt-BR/firefox-92.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9ae38b8755dcb1fdaccc288e2ed558cf271a3389fcf26f99ea9acf79bb33b472"; + sha256 = "ae51131c8e6c99f15034e851d48f8b08c008a5a9edbecc05e7af2df9cb4d1c43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pt-PT/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pt-PT/firefox-92.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c6395580e5420f73ca0e29f3219e2cf9c83752f2cbc035fc80627770cb8a7f36"; + sha256 = "7568cd2077858ca9944fdb5eee9c991bbc5ad53cf355f161aa21342d61427a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/rm/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/rm/firefox-92.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "acb62c5a011782273f8129f81e3b3692c86f2ccc54825e4886721a80e9210363"; + sha256 = "089f4383a2f586a9196d683126f69164465f0ec35e7adabb57ef961820280e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ro/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ro/firefox-92.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "95b4f0f29001c364ecca9df0fa3d2550400eace9730867325547880bd0eec72a"; + sha256 = "d40ca2a9def1c5667e39d1fa711b22383ebcfc99139d2e2dd29fd891f900406b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ru/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ru/firefox-92.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f53c5d8a14b56cba20fe1aeb77074e2a0758c9592a780ba3ad630401791eba0f"; + sha256 = "3de026d11f3b6ee19f95a1ad9b6eb3620697c4afda9627d54782c0f9eff3d421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sco/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sco/firefox-92.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a475a8321aaa81ba293ff9c0ca527b198810ded5f6cb3c2b54009abf89118018"; + sha256 = "4fe831c9d2d5444c61b8310be958de7174b5058e873f897159a5db5434a38cd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/si/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/si/firefox-92.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "43c6acf3fab766bcf46507fe92ad7af808740996303336d56e296848372c3864"; + sha256 = "0473706c50ba90efc8ceffcf1dd8fc7aa4f043d4494a29ff95f289d65a4d5938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sk/firefox-92.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "d0e01e60c6dff585a91247f186ddcef007761e44debac2034266a0d8518c3ed9"; + sha256 = "ee20205a3b2e92e3aa54318dcaec7d9ad4a43c3cfde7b890652dbec7b7f36d30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sl/firefox-92.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4881245b4d9185fb1997a5ce3563f18aef526f2e5d04c407b9c6257ae8ac6251"; + sha256 = "d4890198b1d21ceef36c7d4531f37726e4b769874cfbc8ab3882ebabe36bc037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/son/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/son/firefox-92.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "df87da0870a0ffaffb37be3f52df6894a22904d0f0d234714d8a8667e1cf0427"; + sha256 = "715e12adc1a9e1597d9116f49598eca3f1e4161e4cb8bd80b666e4f8b5aa166a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sq/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sq/firefox-92.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "19ae236fb43e538621ef65399628d74baddf3dae4b4cb287d2c5cb1ec987fa9b"; + sha256 = "a5b982feb51839aace544c0e35244c77a3dac26ddda652ab5ee18c1472f7ee5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sr/firefox-92.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "23833e50ef5e8d22b1442f7c564aaa71a7b4c8fdd0907c3688938db8b850eee6"; + sha256 = "2bdba656b4b7fe0f83ed895b77ba7d0e1e0701b98c9603c210a10ebc4d0061fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sv-SE/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sv-SE/firefox-92.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f1d21b5b94a95a9332892eec75da1bd2f0cc2a75c810e047369ac573c9d179e8"; + sha256 = "58bdd781766057ee0eadf439b90964c4c6d09eb27b4d085d2eb6ebdb60147922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/szl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/szl/firefox-92.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "12d53befb5c5ed158e32cfd3b8a4ee0b1a839b9303ea6615c8dd9a92703f17b5"; + sha256 = "3de916e83f388da456ecd420008dfb6a41707699c507ab318aed2b060af7e369"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ta/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ta/firefox-92.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "33e905284d3f7f5002387dc769078e6cfc591484fc7377ddcbd3e90f3acd32f1"; + sha256 = "ededbd930c5430b5582093ed385ac0ed81ac48da31cc51d02fdd11fa582eba75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/te/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/te/firefox-92.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "bf2cca68f09e2773a6755a54ad30905a7cba8cd873f8e27a835bbc3514d9471b"; + sha256 = "9913061ffee19132a8a560d13c1a9948cb57c67e1fb1a243ecbfb1973fb072e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/th/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/th/firefox-92.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "2adf3dfe859661dc8ce44a70f72c2f050baefb47b4b9fba50d752006aa4accb4"; + sha256 = "4e9f765ae6677e00720f1c7bd9bfd3a7f83e9c68a889958444430d086991d7c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/tl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/tl/firefox-92.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "065f7448133e1b07135be3f1c08550e7d8ae3392b491b20945a2c6c8b962163a"; + sha256 = "d98f74c41c1b39d9946f55ac3803826bcade325458b1415ebd6e93e5ff18b03f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/tr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/tr/firefox-92.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "52e01277d8c8681929fa9fe23a5c70243cfecc140056fcc6645b34a6f52e54c5"; + sha256 = "0b0dd787cfec56d8c7cd1fec959b589958e7ed59ac9415fc0374486b1bbc567f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/trs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/trs/firefox-92.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "a19a59cd21872e40eb5eb51c7999dc8a585e074140053090f6c328d68747a159"; + sha256 = "98bf2ef8b94fc3cfeaa324ac4fb07c28723072a09150f68835ed07fc6429d796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/uk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/uk/firefox-92.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "08ae68dff91152a44f79d54c65e6f40b396209755da22652740b02fa70b5f624"; + sha256 = "87c66d8f1155b428879b1fe83ca0f439cbe323b1a35d33d7d1fd6c30a73ed8ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ur/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ur/firefox-92.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "4a6d9e0b452e553b9badf05c0f6f8e3603c5d9c4db016d8e07d3b1b1de136455"; + sha256 = "8bfb0c2cdb60e7e3964cc5cfa363633d03fa28cb149411883ba00044448e0eb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/uz/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/uz/firefox-92.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d733aec122abd6ec71a17cacaed75479da23f0300d167aa470c6f7982a469150"; + sha256 = "2bfad6b583a7052b97c89681fe53b27e2c4ad97f40ee9e3d4be59a29b204f39a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/vi/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/vi/firefox-92.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "612c5c0e4fc556c33e37dc8ba5792c0880293d6881d95b2567d9b1932e1d151e"; + sha256 = "54557679f6f58dded05c688338829b590eaca85cddc36a1e14263e07f39bd102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/xh/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/xh/firefox-92.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "df79b82dae25a4d36d92460be4a3e02eae683793258f2a53322391a7866b32d9"; + sha256 = "dec9743fc37e7d7f614293e65874d0dead710e6641dd3e2afb9cfc377a8900d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/zh-CN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/zh-CN/firefox-92.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "416e5869fbb13391ac7e78f0477fecc8a00527dbc3612bc35d3c8d4b9686bd48"; + sha256 = "cdaf04b42adc999eda8108c18a62990ec18984c1133a98743b8059ff9a774c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/zh-TW/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/zh-TW/firefox-92.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5d2ce39f7347216e1358f002f94d6fb3a52707412403b0e6d757de92bf9d3f72"; + sha256 = "dc84f295a187bb49172953282ccef628a492b4f24050715d9591d842143e5688"; } ]; } From f6eb933d1c695eb4f1444508c7210c09b92359e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Sep 2021 12:41:20 +0000 Subject: [PATCH 78/95] python38Packages.robotframework: 4.1 -> 4.1.1 --- pkgs/development/python-modules/robotframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 749c7815fb17..3cc833b561ef 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "09k008252x3l4agl9f8ai4a9mn0dp3m5s81mp1hnsf0hribb0s96"; + sha256 = "19pmjd9z3g9xpbri363lzd0gi1xa06aiyw2wjnxwqmd73x6pw695"; }; checkInputs = [ jsonschema ]; From dd50512f677aed11088ff227e7b3b8801841abed Mon Sep 17 00:00:00 2001 From: Tomoya Otabi Date: Thu, 9 Sep 2021 22:33:49 +0900 Subject: [PATCH 79/95] fishPlugins.fzf-fish: 5.6 -> 7.3 (#137153) --- pkgs/shells/fish/plugins/fzf-fish.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index 51e7dcc096b8..3547af490e6a 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -1,17 +1,17 @@ -{ lib, buildFishPlugin, fetchFromGitHub, fzf, clownfish, fishtape_3 }: +{ lib, stdenv, buildFishPlugin, fetchFromGitHub, fd, fzf, util-linux, clownfish, fishtape_3 }: buildFishPlugin rec { pname = "fzf.fish"; - version = "5.6"; + version = "7.3"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - sha256 = "1b280n8bh00n4vkm19zrn84km52296ljlm1zhz95jgaiwymf2x73"; + sha256 = "16mdfyznxjhv7x561srl559misn37a35d2q9fspxa7qg1d0sc3x9"; }; - checkInputs = [ fzf ]; + checkInputs = [ fzf fd util-linux ]; checkPlugins = [ clownfish fishtape_3 ]; checkFunctionDirs = [ "./functions" ]; checkPhase = '' @@ -20,10 +20,16 @@ buildFishPlugin rec { rm -r tests/*git* # Disable tests that are failing, probably because of our wrappers + rm -r tests/configure_bindings rm -r tests/search_shell_variables - fishtape tests/*/*.fish - ''; + # Disable tests that are failing, because there is not 'rev' command + rm tests/preview_file/custom_file_preview.fish + + '' + ( + if stdenv.isDarwin then ''script /dev/null fish -c "fishtape tests/*/*.fish"'' + else ''script -c 'fish -c "fishtape tests/*/*.fish"' '' + ); meta = with lib; { description = "Augment your fish command line with fzf key bindings"; From 61a2864b18b0a79e701650a7b517b06aa4efcb3b Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 8 Sep 2021 16:15:45 +0200 Subject: [PATCH 80/95] llvmPackages_rocm: add update script --- .../compilers/llvm/rocm/llvm/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/development/compilers/llvm/rocm/llvm/default.nix b/pkgs/development/compilers/llvm/rocm/llvm/default.nix index 05b6d9de0869..8f1fcef5bcb9 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, writeScript , cmake , python3 , libxml2 @@ -88,6 +89,23 @@ in stdenv.mkDerivation rec { passthru.src = src; + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github + + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)" + if [[ "$version" != "$current_version" ]]; then + tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")" + tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" + sed -i "pkgs/development/compilers/llvm/rocm/default.nix" \ + -e 's,version = "\(.*\)",version = "'"$version"'",' \ + -e 's,hash = "\(.*\)",hash = "sha256-'"$tarball_hash"'",' + else + echo rocm-llvm already up-to-date + fi + ''; + meta = with lib; { description = "ROCm fork of the LLVM compiler infrastructure"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; From 6e93fa31f27d49787448f20c7ebe1c16656e7ad4 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 8 Sep 2021 19:12:32 +0200 Subject: [PATCH 81/95] rocclr: add update script --- pkgs/development/libraries/rocclr/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index c96753f9a4b2..eed5b998ee7b 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, writeScript , cmake , rocm-cmake , clang @@ -51,6 +52,13 @@ stdenv.mkDerivation rec { --replace "/build/source/build" "$out" ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/ROCclr/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version rocclr "$version" + ''; + meta = with lib; { description = "Radeon Open Compute common language runtime"; homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; From 9d269a87e1284ef7a9816fef7bc62e93e9dc1f4e Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 9 Sep 2021 13:49:30 +0200 Subject: [PATCH 82/95] rocminfo: add update script --- pkgs/development/tools/rocminfo/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index bf95e15873fa..cef5d7e3666f 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, rocm-runtime, python3, rocm-cmake, busybox, gnugrep +{ stdenv, lib, fetchFromGitHub, writeScript, fetchpatch, cmake, rocm-runtime, python3, rocm-cmake, busybox, gnugrep # rocminfo requires that the calling user have a password and be in # the video group. If we let rocm_agent_enumerator rely upon # rocminfo's output, then it, too, has those requirements. Instead, @@ -35,4 +35,19 @@ stdenv.mkDerivation rec { '' + lib.optionalString (defaultTargets != []) '' echo '${lib.concatStringsSep "\n" defaultTargets}' > $out/bin/target.lst ''; + + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocminfo/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version rocminfo "$version" + ''; + + meta = with lib; { + description = "ROCm Application for Reporting System Info"; + homepage = "https://github.com/RadeonOpenCompute/rocminfo"; + license = licenses.ncsa; + maintainers = with maintainers; [ lovesegfault ]; + platforms = platforms.linux; + }; } From 48a54cc8203c3a7dab60e3e87132087a9e3d946f Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 9 Sep 2021 14:02:40 +0200 Subject: [PATCH 83/95] hip: add update script --- pkgs/development/compilers/hip/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index ff5a34330ede..6a1e6383958d 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -20,6 +20,7 @@ , rocm-runtime , rocm-thunk , rocminfo +, writeScript , writeText }: @@ -163,4 +164,19 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/hipcc --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin --prefix PATH : ${lld}/bin --set NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt} 1 --prefix NIX_LDFLAGS ' ' -L${compiler-rt}/lib --prefix NIX_LDFLAGS_FOR_TARGET ' ' -L${compiler-rt}/lib wrapProgram $out/bin/hipconfig --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin ''; + + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version hip "$version" + ''; + + meta = with lib; { + description = "C++ Heterogeneous-Compute Interface for Portability"; + homepage = "https://github.com/ROCm-Developer-Tools/HIP"; + license = licenses.mit; + maintainers = with maintainers; [ lovesegfault ]; + platforms = platforms.linux; + }; } From b31a7ba0029e6aac3ff6cf9b94df3e61a9ef4cf4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 Sep 2021 16:51:02 +0200 Subject: [PATCH 84/95] firefox-91-esr: 91.0.1esr -> 91.1.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 5802a339baf5..4c96df42b817 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.0.1esr"; + version = "91.1.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "79703b3ec615d10957350719b2c034df10fd47d140c3557cd7de665ef4430973b97c1906d5408ddaf8855c1424e87eb9b1b568322ad8fbdb956fca219a865d66"; + sha512 = "dad0249eb2ce66eb90ff5daf0dfb63105a19790dd45661d977f7cc889644e86b33b9b0c472f46d4032ae2e4fe02c2cf69d552156fb0ad4cf77a15b3542556ed3"; }; meta = { From d11cd01ad148d61d9ad364ac8d488b3eb8d75030 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 Sep 2021 16:51:16 +0200 Subject: [PATCH 85/95] firefox-78-esr: 78.13.1esr -> 78.14.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4c96df42b817..ac4a9f9c0e72 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -57,10 +57,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - version = "78.13.0esr"; + version = "78.14.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "78a5dc8713ab879ebfc3b8fd7a8219844d06f0d897342fdf9a11471633d98e148ff85cf10e561899df4910b94a33b57709b64788df4621a8c0b83eb9a7102cef"; + sha512 = "5d5e4b1197f87b458a8ab14a62701fa0f3071e9facbb4fba71a64ef69abf31edbb4c5efa6c20198de573216543b5289270b5929c6e917f01bb165ce8c139c1ac"; }; meta = { From 042d1c5497e58572e2eae46fffb22b8d0c9eafbb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Sep 2021 15:12:16 +0000 Subject: [PATCH 86/95] python38Packages.sphinxcontrib-bibtex: 2.3.0 -> 2.4.0 --- .../python-modules/sphinxcontrib-bibtex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 5930c7e71b7a..34f7b3732d35 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "2.3.0"; + version = "2.4.0"; pname = "sphinxcontrib-bibtex"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1aae1005935ae8e6499750b4ef1c8251a14ba16e025d0c0154fe2b6bf45defc0"; + sha256 = "be503e2437651531e0512dbe732def518ad2b8d0d785c3b4f36508d814d22e46"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; From 2938a58f2d3a9946772c56b1927aea04759b16d2 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 9 Sep 2021 17:49:31 +0200 Subject: [PATCH 87/95] linux_lqx: 5.13.9 -> 5.13.15 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index dae6072aa780..118f0e632e65 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.13.9"; + version = "5.13.15"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-aAnwPw1qoGhUdWN/uaQa+5bi0DFZB/wDfNow7FgMMFE="; + sha256 = "sha256-YDdBOB49NkX2V+lA7JeKRXfpo81/MSoLDOsPjphhBJA="; }; extraMeta = { From bbdb34ab0416970de9bc2c4e19c9b4972f79b8a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 Sep 2021 18:44:51 +0200 Subject: [PATCH 88/95] python3Packages.pulsectl: add comment for substitution --- pkgs/development/python-modules/pulsectl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 72c2689d3833..19fa273c0466 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { }; patches = [ + # substitute library paths for libpulse and librt (substituteAll { src = ./library-paths.patch; libpulse = "${libpulseaudio.out}/lib/libpulse${stdenv.hostPlatform.extensions.sharedLibrary}"; From c9ce275aa4e7176d8e480e4b8bafe76f9c837162 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Sep 2021 18:45:33 +0000 Subject: [PATCH 89/95] treewide: "does not exists" -> "does not exist" I noticed this minor grammar mistake when running update.nix, and then while grepping to find the source I noticed we had it a few times in Nixpkgs. Just as easy to fix treewide as it was to fix the one occurrence I noticed. --- maintainers/scripts/update.nix | 4 ++-- nixos/modules/services/backup/znapzend.nix | 2 +- nixos/modules/services/monitoring/nagios.nix | 2 +- nixos/modules/services/networking/firefox/sync-server.nix | 2 +- pkgs/development/mobile/androidenv/emulate-app.nix | 2 +- pkgs/misc/vscode-extensions/updateSettings.nix | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 7435cf64425c..d881d68301ba 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -103,7 +103,7 @@ let pathContent = lib.attrByPath prefix null pkgs; in if pathContent == null then - builtins.throw "Attribute path `${path}` does not exists." + builtins.throw "Attribute path `${path}` does not exist." else packagesWithPath prefix (path: pkg: builtins.hasAttr "updateScript" pkg) pathContent; @@ -115,7 +115,7 @@ let package = lib.attrByPath (lib.splitString "." path) null pkgs; in if package == null then - builtins.throw "Package with an attribute name `${path}` does not exists." + builtins.throw "Package with an attribute name `${path}` does not exist." else if ! builtins.hasAttr "updateScript" package then builtins.throw "Package with an attribute name `${path}` does not have a `passthru.updateScript` attribute defined." else diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index debb2a397050..1fccc7cd6076 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -324,7 +324,7 @@ in autoCreation = mkOption { type = bool; default = false; - description = "Automatically create the destination dataset if it does not exists."; + description = "Automatically create the destination dataset if it does not exist."; }; zetup = mkOption { diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 0afaefe04e18..280a9a001b5b 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -41,7 +41,7 @@ let validated = pkgs.runCommand "nagios-checked.cfg" {preferLocalBuild=true;} '' cp ${file} nagios.cfg # nagios checks the existence of /var/lib/nagios, but - # it does not exists in the build sandbox, so we fake it + # it does not exist in the build sandbox, so we fake it mkdir lib lib=$(readlink -f lib) sed -i s@=${nagiosState}@=$lib@ nagios.cfg diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 24f768649530..1ad573abfca3 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -119,7 +119,7 @@ in password, and the setting is used by the server to generate cryptographically-signed authentication tokens. - If this file does not exists, then it is created with a generated + If this file does not exist, then it is created with a generated settings. ''; }; diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 83be06a31419..ef803779ad64 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" - # Create a virtual android device for testing if it does not exists + # Create a virtual android device for testing if it does not exist ${sdk}/libexec/android-sdk/tools/bin/avdmanager list target if [ "$(${sdk}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ] diff --git a/pkgs/misc/vscode-extensions/updateSettings.nix b/pkgs/misc/vscode-extensions/updateSettings.nix index c7fecf080720..443b40930279 100644 --- a/pkgs/misc/vscode-extensions/updateSettings.nix +++ b/pkgs/misc/vscode-extensions/updateSettings.nix @@ -6,7 +6,7 @@ }: ##User Input { settings ? {} -# if marked as true will create an empty json file if does not exists +# if marked as true will create an empty json file if does not exist , createIfDoesNotExists ? true , vscodeSettingsFile ? ".vscode/settings.json" , userSettingsFolder ? "" From f7cef10c90e9f09f87c013db7f627370df2e2668 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 9 Sep 2021 10:40:40 -0500 Subject: [PATCH 90/95] liburing: 2.0 -> 2.1 Signed-off-by: Austin Seipp --- pkgs/development/libraries/liburing/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index ddd7c7b207da..595f9a5a9cd4 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -4,22 +4,14 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "2.0"; + version = "2.1"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "0has1yd1ns5q5jgcmhrbgwhbwq0wix3p7xv3dyrwdf784p56izkn"; + sha256 = "sha256-7wSpKqjIdQeOdsQu4xN3kFHV49n6qQ3xVbjUcY1tmas="; }; - patches = [ - # Fix build on 32-bit ARM - (fetchpatch { - url = "https://github.com/axboe/liburing/commit/808b6c72ab753bda0c300b5683cfd31750d1d49b.patch"; - sha256 = "1x7a9c5a6rwhfsbjqmhbnwh2aiin6yylckrqdjbzljrprzf11wrd"; - }) - ]; - separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. From 70a469d855e0b42c7a1d946f339edcee44f92cbe Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 6 Sep 2021 08:28:52 +0200 Subject: [PATCH 91/95] =?UTF-8?q?ocamlPackages.js=5Fof=5Focaml:=203.9.1=20?= =?UTF-8?q?=E2=86=92=203.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 6965d5fa0abb..4cdd0b8e3e24 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -5,12 +5,12 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.9.1"; + version = "3.10.0"; useDune2 = true; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - sha256 = "0ib551kfsjlp9vr3fk36hrbq7xxyl8bj6vcn3ccr0s370bsmgpm6"; + sha256 = "09k19bygxl766dmshrp5df3i99jfm8bmamb4jggm62p3hg19bzkv"; }; nativeBuildInputs = [ cppo menhir ]; From 894ff4f2e471f91de7ac54e432e9c9cbcb1830ec Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 9 Sep 2021 22:51:08 +0200 Subject: [PATCH 92/95] signal-desktop: 5.16.0 -> 5.17.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 cf46b3e98900..43985e773cb0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.16.0"; # Please backport all updates to the stable channel. + version = "5.17.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: @@ -35,7 +35,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 = "1na5ja68h14smfwxrli1kfr6fhf5dshyvcdaj0c4mwms838bdl4j"; + sha256 = "1m3bkrshlipxlbf4xr7gpw3zn1k39cdysrqmw705hy2cwf7pw7yy"; }; nativeBuildInputs = [ From 05c0b2743fb434ecf2d0b8446decdf4a0f9d1c4b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 9 Sep 2021 22:58:14 +0200 Subject: [PATCH 93/95] chromiumBeta: 94.0.4606.31 -> 94.0.4606.41 --- .../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 f095138416bd..30d56c1014b3 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": "94.0.4606.31", - "sha256": "1f5hk2acd9lj88m2acz8ik85fh5h3giz65p19dpfg92zsyly54nf", - "sha256bin64": "1ypf9j51a4kmx27x3s9izzbd2r094idz194gwhbdly75l1x8hk4z", + "version": "94.0.4606.41", + "sha256": "0kdi8rbly002abg9jwkmv6xmfcv7g0rm68lbdsnhr0biy7wvadij", + "sha256bin64": "0ayhppzwc4ia36hpakqg9rh3cggw33c7d2zkfaias3zm14k86ga2", "deps": { "gn": { "version": "2021-08-11", From 6b75457c7f1e4a8a7352b53b23341a5e070267fa Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 15 Aug 2021 18:03:06 +0300 Subject: [PATCH 94/95] tome4: 1.6.7 -> 1.7.4 --- pkgs/games/tome4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index ace9b384663e..581220c339c4 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "tome4"; - version = "1.6.7"; + version = "1.7.4"; src = fetchurl { url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "0283hvms5hr29zr0grd6gq059k0hg8hcz3fsmwjmysiih8790i68"; + sha256 = "sha256-w1NPM/SMnPAnAl6z9E6Xsj3mEqZtXzFe1IMPmlKr8qQ="; }; desktop = makeDesktopItem { From 9fe2e640cc8540bacc4764892317f908d3562bc3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 10 Sep 2021 08:18:54 +1000 Subject: [PATCH 95/95] youtube-dl: remove maintainer --- pkgs/tools/misc/youtube-dl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7bf0c440a37a..680000b33713 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { ''; license = licenses.publicDomain; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz ma27 zowoq ]; + maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz ma27 ]; }; }