From 1b154aacb169de9fa64da21e6181bfef4d62a408 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Thu, 11 Mar 2021 10:22:24 +0100 Subject: [PATCH 01/89] pythonPackages.pywebview: 3.3.1 -> 3.4 also fix tests by adding pyqtwebengine --- .../python-modules/pywebview/default.nix | 40 ++++++++++++++++--- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 545fb236732..a020517dcce 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -1,25 +1,53 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, importlib-resources, pytest, xvfb_run }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, importlib-resources +, pyqtwebengine +, pytest +, pythonOlder +, qt5 +, xvfb_run +}: buildPythonPackage rec { pname = "pywebview"; - version = "3.3.1"; + version = "3.4"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "r0x0r"; repo = "pywebview"; rev = version; - sha256 = "015z7n0hdgkzn0p7aw1xsv6lwc260p8q67jx0zyd1zghnwyj8k79"; + sha256 = "sha256-3JHwtw8oReolEl4k8cdt7GCVGNkfWWJN6EnZYHxzDO8="; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + nativeBuildInputs = [ + qt5.wrapQtAppsHook + ]; - checkInputs = [ pytest xvfb_run ]; + propagatedBuildInputs = [ + pyqtwebengine + ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + + checkInputs = [ + pytest + xvfb_run + ]; checkPhase = '' + # Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED + export HOME=$TMPDIR + # QStandardPaths: XDG_RUNTIME_DIR not set + export XDG_RUNTIME_DIR=$HOME/xdg-runtime-dir + pushd tests + substituteInPlace run.sh \ + --replace "PYTHONPATH=.." "PYTHONPATH=$PYTHONPATH" \ + --replace "pywebviewtest test_js_api.py::test_concurrent ''${PYTEST_OPTIONS}" "# skip flaky test_js_api.py::test_concurrent" + patchShebangs run.sh + wrapQtApp run.sh + xvfb-run -s '-screen 0 800x600x24' ./run.sh popd ''; From 6556beb77968eee00c6c83db8b8c880a5e6b83e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 23 Mar 2021 11:50:54 +0100 Subject: [PATCH 02/89] mkl: 2020.3.304 -> 2021.1.1.52 Intel MKL is succeeded by Intel oneMKL. This also results in several changes: - The versioning scheme has been changed, it now consists of a version such as "2021.1.1" and a build such as "52". - The tarball of RPMs has been replaced by a relatively complex installer, so instead we use the RPMs provided by the upstream Yum repository. To better detect breakage, the passthru tests also check static builds and with parallel (iomp) execution. --- .../libraries/science/math/mkl/default.nix | 172 ++++++++++-------- .../science/math/mkl/test/default.nix | 18 +- 2 files changed, 111 insertions(+), 79 deletions(-) diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 34fea3162a9..1f60f4d9538 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -17,40 +17,57 @@ let # Release notes and download URLs are here: # https://registrationcenter.intel.com/en/products/ - version = "${year}.${spot}.${rel}"; + version = "${mklVersion}.${rel}"; # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 - year = if stdenvNoCC.isDarwin then "2019" else "2020"; - spot = if stdenvNoCC.isDarwin then "3" else "4"; - rel = if stdenvNoCC.isDarwin then "199" else "304"; + mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.1.1"; + rel = if stdenvNoCC.isDarwin then "199" else "52"; - # Replace `openmpSpot` by `spot` after 2020. - openmpSpot = if stdenvNoCC.isDarwin then spot else "3"; + # Intel openmp uses its own versioning. + openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "19.1.3"; + openmpRel = "189"; - rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; - - # Intel openmp uses its own versioning, but shares the spot release patch. - openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1"; - openmp-ver = "${openmp}.${openmpSpot}-${rel}-${openmp}.${openmpSpot}-${rel}"; + # Thread Building Blocks release. + tbbRel = "119"; shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; -in stdenvNoCC.mkDerivation { + oneapi-mkl = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; + hash = "sha256-G2Y7iX3UN2YUJhxcMM2KmhONf0ls9owpGlOo8hHOfqA="; + }; + + oneapi-mkl-common = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; + hash = "sha256-HrMt2OcPIRxM8EL8SPjYTyuHJnC7RhPFUrvLhRH+7vc="; + }; + + oneapi-mkl-common-devel = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; + hash = "sha256-XDE2WFJzEcpujFmO2AvqQdipZMvKB6/G+ksBe2sE438="; + }; + + oneapi-mkl-devel = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; + hash = "sha256-GhUJZ0Vr/ZXp10maie29/5ryU7zzX3F++wRCuuFcE0s="; + }; + + oneapi-openmp = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm"; + hash = "sha256-yP2c4aQAFNRffjLoIZgWXLcNXbiez8smsgu2wXitefU="; + }; + + oneapi-tbb = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${mklVersion}-${mklVersion}-${tbbRel}.x86_64.rpm"; + hash = "sha256-K1BvhGoGVU2Zwy5vg2ZvJWBrSdh5uQwo0znt5039X0A="; + }; + +in stdenvNoCC.mkDerivation ({ pname = "mkl"; inherit version; - src = if stdenvNoCC.isDarwin - then - (fetchurl { - url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg"; - sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f"; - }) - else - (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/l_mkl_${version}.tgz"; - hash = "sha256-IxTUZTaXTb0I8qTk+emhVdx+eeJ5jHTn3fqtAKWRfqU="; - }); + dontUnpack = stdenvNoCC.isLinux; nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin then @@ -63,30 +80,15 @@ in stdenvNoCC.mkDerivation { tar xzvf $f done '' else '' - # Common stuff - rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm - rpmextract rpm/intel-mkl-common-f-${rpm-ver}.noarch.rpm + rpmextract ${oneapi-mkl} + rpmextract ${oneapi-mkl-common} + rpmextract ${oneapi-mkl-common-devel} + rpmextract ${oneapi-mkl-devel} + rpmextract ${oneapi-openmp} + rpmextract ${oneapi-tbb} + ''; - # Dynamic libraries - rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-core-rt-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-gnu-f-rt-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-gnu-rt-${rpm-ver}.x86_64.rpm - - # Intel OpenMP runtime - rpmextract rpm/intel-openmp-${openmp-ver}.x86_64.rpm - '' + (if enableStatic then '' - # Static libraries - rpmextract rpm/intel-mkl-cluster-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-gnu-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-gnu-f-${rpm-ver}.x86_64.rpm - '' else '' - # Take care of installing dynamic-only PkgConfig files during the installPhase - '' - ); - - installPhase = '' + installPhase = if stdenvNoCC.isDarwin then '' for f in $(find . -name 'mkl*.pc') ; do bn=$(basename $f) substituteInPlace $f \ @@ -95,42 +97,54 @@ in stdenvNoCC.mkDerivation { --replace "lib/intel64_lin" "lib" \ --replace "lib/intel64" "lib" done - for f in $(find opt/intel -name 'mkl*iomp.pc') ; do substituteInPlace $f \ --replace "../compiler/lib" "lib" done - '' + - (if stdenvNoCC.isDarwin then '' - mkdir -p $out/lib - cp -r compilers_and_libraries_${version}/mac/mkl/include $out/ + mkdir -p $out/lib - cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/ - cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/ - cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/ - cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/mac/mkl/include $out/ - mkdir -p $out/lib/pkgconfig - cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig + cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/ + cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/ + + mkdir -p $out/lib/pkgconfig + cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig '' else '' - mkdir -p $out/lib - cp license.txt $out/lib/ + for f in $(find . -name 'mkl*.pc') ; do + bn=$(basename $f) + substituteInPlace $f \ + --replace $\{MKLROOT} "$out" \ + --replace "lib/intel64" "lib" - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/ + sed -r -i "s|^prefix=.*|prefix=$out|g" $f + done - mkdir -p $out/lib/pkgconfig - '') + + for f in $(find opt/intel -name 'mkl*iomp.pc') ; do + substituteInPlace $f --replace "../compiler/lib" "lib" + done + + # License + install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/2021.1.1/licensing/en/license.txt + + # Dynamic libraries + install -Dm0755 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* + install -Dm0755 -t $out/lib opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so* + install -Dm0755 -t $out/lib opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so* + + # Headers + cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/ + '' + (if enableStatic then '' - cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/* $out/lib/ - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/ - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/* $out/lib/pkgconfig + install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a + install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*.pc '' else '' - cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/*.so* $out/lib/ - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/*.so* $out/lib/ - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/*dynamic*.pc $out/lib/pkgconfig + cp opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib + install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*dynamic*.pc '') + '' - # Setup symlinks for blas / lapack ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt} @@ -159,13 +173,18 @@ in stdenvNoCC.mkDerivation { dontStrip = true; dontPatchELF = true; - passthru.tests.pkg-config = callPackage ./test { }; + passthru.tests = { + pkg-config-dynamic-iomp = callPackage ./test { enableStatic = false; execution = "iomp"; }; + pkg-config-static-iomp = callPackage ./test { enableStatic = true; execution = "iomp"; }; + pkg-config-dynamic-seq = callPackage ./test { enableStatic = false; execution = "seq"; }; + pkg-config-static-seq = callPackage ./test { enableStatic = true; execution = "seq"; }; + }; meta = with lib; { - description = "Intel Math Kernel Library"; + description = "Intel OneAPI Math Kernel Library"; longDescription = '' - Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort - for future generations of Intel processors. It is compatible with your + Intel OneAPI Math Kernel Library (Intel oneMKL) optimizes code with minimal + effort for future generations of Intel processors. It is compatible with your choice of compilers, languages, operating systems, and linking and threading models. ''; @@ -174,4 +193,9 @@ in stdenvNoCC.mkDerivation { platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ bhipple ]; }; -} +} // lib.optionalAttrs stdenvNoCC.isDarwin { + src = fetchurl { + url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg"; + sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f"; + }; +}) diff --git a/pkgs/development/libraries/science/math/mkl/test/default.nix b/pkgs/development/libraries/science/math/mkl/test/default.nix index 688c0ec7c39..cb3355260d1 100644 --- a/pkgs/development/libraries/science/math/mkl/test/default.nix +++ b/pkgs/development/libraries/science/math/mkl/test/default.nix @@ -1,6 +1,14 @@ -{ stdenv, pkg-config, mkl }: +{ stdenv +, pkg-config +, mkl -stdenv.mkDerivation { +, enableStatic ? false +, execution ? "seq" +}: + +let + linkType = if enableStatic then "static" else "dynamic"; +in stdenv.mkDerivation { pname = "mkl-test"; version = mkl.version; @@ -8,19 +16,19 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mkl ]; + buildInputs = [ (mkl.override { inherit enableStatic; }) ]; doCheck = true; buildPhase = '' # Check regular Nix build. - gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test + gcc test.c -o test $(pkg-config --cflags --libs mkl-${linkType}-ilp64-${execution}) # Clear flags to ensure that we are purely relying on options # provided by pkg-config. NIX_CFLAGS_COMPILE="" \ NIX_LDFLAGS="" \ - gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test + gcc test.c -o test $(pkg-config --cflags --libs mkl-${linkType}-ilp64-${execution}) ''; installPhase = '' From 08b21db9c9d7594a0fe8c207be7e782a8757182b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 24 Mar 2021 21:03:44 +0000 Subject: [PATCH 03/89] nixos/amdgpu: remove https://github.com/NixOS/nixpkgs/pull/111551#issuecomment-802082766 --- nixos/modules/hardware/video/amdgpu.nix | 9 --------- nixos/modules/module-list.nix | 1 - 2 files changed, 10 deletions(-) delete mode 100644 nixos/modules/hardware/video/amdgpu.nix diff --git a/nixos/modules/hardware/video/amdgpu.nix b/nixos/modules/hardware/video/amdgpu.nix deleted file mode 100644 index 42fc8fa362d..00000000000 --- a/nixos/modules/hardware/video/amdgpu.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, ... }: - -with lib; -{ - config = mkIf (elem "amdgpu" config.services.xserver.videoDrivers) { - boot.blacklistedKernelModules = [ "radeon" ]; - }; -} - diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4a63a09ab84..3ab1a89e6d3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -72,7 +72,6 @@ ./hardware/opentabletdriver.nix ./hardware/wooting.nix ./hardware/uinput.nix - ./hardware/video/amdgpu.nix ./hardware/video/amdgpu-pro.nix ./hardware/video/ati.nix ./hardware/video/capture/mwprocapture.nix From 1a56d59c6c696ee2bf855de2da5180bcf4d11ef2 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 27 Mar 2021 23:14:58 -0300 Subject: [PATCH 04/89] pythonPackages.localimport: init at 1.7.3 --- .../python-modules/localimport/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/localimport/default.nix diff --git a/pkgs/development/python-modules/localimport/default.nix b/pkgs/development/python-modules/localimport/default.nix new file mode 100644 index 00000000000..3c41618d5b8 --- /dev/null +++ b/pkgs/development/python-modules/localimport/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "localimport"; + version = "1.7.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-p7ACOzJRwH9hICMcxtVt/r+twEoFsDxPKGuarFnFIbo="; + }; + + pythonImportsCheck = [ "localimport" ]; + + meta = with lib; { + homepage = "https://github.com/NiklasRosenstein/py-localimport"; + description = "Isolated import of Python modules"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2875eca59b3..5edbc7bbff7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3990,6 +3990,8 @@ in { lmtpd = callPackage ../development/python-modules/lmtpd { }; + localimport = callPackage ../development/python-modules/localimport { }; + localzone = callPackage ../development/python-modules/localzone { }; locket = callPackage ../development/python-modules/locket { }; From 77ca695ff9a78cbf40a334e4d601e5ac318b275f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 30 Mar 2021 10:42:43 +0200 Subject: [PATCH 05/89] tcp-cutter: rename from cutter --- pkgs/tools/networking/{cutter => tcp-cutter}/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/tools/networking/{cutter => tcp-cutter}/default.nix (80%) diff --git a/pkgs/tools/networking/cutter/default.nix b/pkgs/tools/networking/tcp-cutter/default.nix similarity index 80% rename from pkgs/tools/networking/cutter/default.nix rename to pkgs/tools/networking/tcp-cutter/default.nix index 8d94da7737b..ade825dbe10 100644 --- a/pkgs/tools/networking/cutter/default.nix +++ b/pkgs/tools/networking/tcp-cutter/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cutter-1.04"; + pname = "tcp-cutter"; + version = "1.04"; src = fetchurl { - url = "http://www.digitage.co.uk/digitage/files/cutter/${name}.tgz"; + url = "http://www.digitage.co.uk/digitage/files/cutter/${pname}-${version}.tgz"; sha256 = "100iy31a3njif6vh9gfsqrm14hac05rrflla275gd4rkxdlnqcqv"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3738b7f5eb1..e6620c0f162 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3624,7 +3624,7 @@ in curlftpfs = callPackage ../tools/filesystems/curlftpfs { }; - cutter = callPackage ../tools/networking/cutter { }; + tcp-cutter = callPackage ../tools/networking/tcp-cutter { }; cwebbin = callPackage ../development/tools/misc/cwebbin { }; From ca9ca6eec9dfe610367cd82d7d20f17cf71736af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 30 Mar 2021 12:10:56 +0200 Subject: [PATCH 06/89] cutter: 1.12.0 -> 2.0.0 This also introduces rizin, which cutter builds on top --- .../tools/analysis/radare2/cutter.nix | 63 ------ .../tools/analysis/radare2/default.nix | 198 ++++++++---------- .../tools/analysis/radare2/update.py | 53 +---- .../tools/analysis/rizin/cutter.nix | 46 ++++ .../tools/analysis/rizin/default.nix | 71 +++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 8 +- 7 files changed, 226 insertions(+), 214 deletions(-) delete mode 100644 pkgs/development/tools/analysis/radare2/cutter.nix create mode 100644 pkgs/development/tools/analysis/rizin/cutter.nix create mode 100644 pkgs/development/tools/analysis/rizin/default.nix diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix deleted file mode 100644 index 6d9543e3836..00000000000 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ fetchFromGitHub, lib, mkDerivation -# nativeBuildInputs -, qmake, pkg-config -# Qt -, qtbase, qtsvg, qtwebengine -# buildInputs -, r2-for-cutter -, python3 -, wrapQtAppsHook }: - -mkDerivation rec { - pname = "radare2-cutter"; - version = "1.12.0"; - - src = fetchFromGitHub { - owner = "radareorg"; - repo = "cutter"; - rev = "v${version}"; - sha256 = "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0"; - }; - - postUnpack = "export sourceRoot=$sourceRoot/src"; - - # Remove this "very helpful" helper file intended for discovering r2, - # as it's a doozy of harddcoded paths and unexpected behavior. - # Happily Nix has everything all set so we don't need it, - # other than as basis for the qmakeFlags set below. - postPatch = '' - substituteInPlace Cutter.pro \ - --replace "include(lib_radare2.pri)" "" - ''; - - nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ]; - propagatedBuildInputs = [ python3.pkgs.pyside2 ]; - buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ]; - - qmakeFlags = with python3.pkgs; [ - "CONFIG+=link_pkg-config" - "PKGCONFIG+=r_core" - # Leaving this enabled doesn't break build but generates errors - # at runtime (to console) about being unable to load needed bits. - # Disable until can be looked at. - "CUTTER_ENABLE_JUPYTER=false" - # Enable support for Python plugins - "CUTTER_ENABLE_PYTHON=true" - "CUTTER_ENABLE_PYTHON_BINDINGS=true" - "SHIBOKEN_EXTRA_OPTIONS+=-I${r2-for-cutter}/include/libr" - ]; - - preBuild = '' - export NIX_LDFLAGS="$NIX_LDFLAGS $(pkg-config --libs python3-embed)" - qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A Qt and C++ GUI for radare2 reverse engineering framework"; - homepage = src.meta.homepage; - license = licenses.gpl3; - maintainers = with maintainers; [ mic92 dtzWill ]; - }; -} diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 287321804e2..f5ce1bbde76 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,9 +1,21 @@ -{lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , buildPackages , pkg-config -, libusb-compat-0_1, readline, libewf, perl, zlib, openssl -, libuv, file, libzip, xxHash -, gtk2 ? null, vte ? null, gtkdialog ? null +, libusb-compat-0_1 +, readline +, libewf +, perl +, zlib +, openssl +, libuv +, file +, libzip +, xxHash +, gtk2 ? null +, vte ? null +, gtkdialog ? null , python3 ? null , ruby ? null , lua ? null @@ -21,108 +33,84 @@ assert pythonBindings -> python3 != null; let inherit (lib) optional; - generic = { - version_commit, # unused - gittap, - gittip, - rev, - version, - sha256, - cs_ver, - cs_sha256 - }: - stdenv.mkDerivation { - pname = "radare2"; - inherit version; - - src = fetchFromGitHub { - owner = "radare"; - repo = "radare2"; - inherit rev sha256; - }; - - postPatch = let - capstone = fetchFromGitHub { - owner = "aquynh"; - repo = "capstone"; - # version from $sourceRoot/shlr/Makefile - rev = cs_ver; - sha256 = cs_sha256; - }; - in '' - mkdir -p build/shlr - cp -r ${capstone} capstone-${cs_ver} - chmod -R +w capstone-${cs_ver} - # radare 3.3 compat for radare2-cutter - (cd shlr && ln -s ../capstone-${cs_ver} capstone) - tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver} - ''; - - postInstall = '' - install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm - ''; - - WITHOUT_PULL="1"; - makeFlags = [ - "GITTAP=${gittap}" - "GITTIP=${gittip}" - "RANLIB=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ranlib" - ]; - configureFlags = [ - "--with-sysmagic" - "--with-syszip" - "--with-sysxxhash" - "--with-openssl" - ]; - - enableParallelBuilding = true; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ] - ++ optional useX11 [ gtkdialog vte gtk2 ] - ++ optional rubyBindings [ ruby ] - ++ optional pythonBindings [ python3 ] - ++ optional luaBindings [ lua ]; - - propagatedBuildInputs = [ - # radare2 exposes r_lib which depends on these libraries - file # for its list of magic numbers (`libmagic`) - libzip - xxHash - ]; - - meta = { - description = "unix-like reverse engineering framework and commandline tools"; - homepage = "http://radare.org/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin makefu mic92 ]; - platforms = with lib.platforms; linux; - inherit version; - }; - }; -in { # # DO NOT EDIT! Automatically generated by ./update.py - radare2 = generic { - version_commit = "25741"; - gittap = "5.1.1"; - gittip = "a86f8077fc148abd6443384362a3717cd4310e64"; - rev = "5.1.1"; - version = "5.1.1"; - sha256 = "0hv9x31iabasj12g8f04incr1rbcdkxi3xnqn3ggp8gl4h6pf2f3"; - cs_ver = "4.0.2"; - cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; - }; - r2-for-cutter = generic { - version_commit = "24959"; - gittap = "4.5.1"; - gittip = "293cf5ae65ba4e28828095dcae212955593ba255"; - rev = "4.5.1"; - version = "4.5.1"; - sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj"; - cs_ver = "4.0.2"; - cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; - }; + gittap = "5.1.1"; + gittip = "a86f8077fc148abd6443384362a3717cd4310e64"; + rev = "5.1.1"; + version = "5.1.1"; + sha256 = "0hv9x31iabasj12g8f04incr1rbcdkxi3xnqn3ggp8gl4h6pf2f3"; + cs_ver = "4.0.2"; + cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; # +in +stdenv.mkDerivation { + pname = "radare2"; + inherit version; + + src = fetchFromGitHub { + owner = "radare"; + repo = "radare2"; + inherit rev sha256; + }; + + postPatch = + let + capstone = fetchFromGitHub { + owner = "aquynh"; + repo = "capstone"; + # version from $sourceRoot/shlr/Makefile + rev = cs_ver; + sha256 = cs_sha256; + }; + in + '' + mkdir -p build/shlr + cp -r ${capstone} capstone-${cs_ver} + chmod -R +w capstone-${cs_ver} + tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver} + ''; + + postInstall = '' + install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm + ''; + + WITHOUT_PULL = "1"; + makeFlags = [ + "GITTAP=${gittap}" + "GITTIP=${gittip}" + "RANLIB=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ranlib" + ]; + configureFlags = [ + "--with-sysmagic" + "--with-syszip" + "--with-sysxxhash" + "--with-openssl" + ]; + + enableParallelBuilding = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ] + ++ optional useX11 [ gtkdialog vte gtk2 ] + ++ optional rubyBindings [ ruby ] + ++ optional pythonBindings [ python3 ] + ++ optional luaBindings [ lua ]; + + propagatedBuildInputs = [ + # radare2 exposes r_lib which depends on these libraries + file # for its list of magic numbers (`libmagic`) + libzip + xxHash + ]; + + meta = { + description = "unix-like reverse engineering framework and commandline tools"; + homepage = "http://radare.org/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ raskin makefu mic92 ]; + platforms = with lib.platforms; linux; + inherit version; + }; } diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index a9a0a234317..ede0a6058a9 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -48,24 +48,6 @@ def get_radare2_rev() -> str: raise RuntimeError(f"No release found at {feed_url}") -def get_cutter_version() -> str: - version_expr = """ -(with import {}; lib.getVersion (qt5.callPackage {})) -""" - return sh("nix", "eval", "--raw", version_expr.strip(), "-I", "radare2={0}".format(SCRIPT_DIR)) - - -def get_r2_cutter_rev() -> str: - version = get_cutter_version() - url = f"https://api.github.com/repos/radareorg/cutter/contents?ref=v{version}" - with urllib.request.urlopen(url) as response: - data = json.load(response) # type: ignore - for entry in data: - if entry["name"] == "radare2": - return entry["sha"] - raise Exception("no radare2 submodule found in github.com/radareorg/cutter") - - def git(dirname: str, *args: str) -> str: return sh("git", "-C", dirname, *args) @@ -94,43 +76,23 @@ def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: ) -def write_package_expr(version: str, info: Dict[str, str]) -> str: - return f"""generic {{ - version_commit = "{info["version_commit"]}"; - gittap = "{info["gittap"]}"; - gittip = "{info["gittip"]}"; - rev = "{info["rev"]}"; - version = "{version}"; - sha256 = "{info["sha256"]}"; - cs_ver = "{info["cs_ver"]}"; - cs_sha256 = "{info["cs_sha256"]}"; - }}""" - - def main() -> None: - radare2_rev = get_radare2_rev() - r2_cutter_rev = get_r2_cutter_rev() + version = get_radare2_rev() with tempfile.TemporaryDirectory() as dirname: git( dirname, "clone", "--branch", - radare2_rev, + version, "https://github.com/radare/radare2", ".", ) nix_file = str(SCRIPT_DIR.joinpath("default.nix")) - radare2_info = get_repo_info(dirname, radare2_rev) - - git(dirname, "fetch", r2_cutter_rev) - git(dirname, "checkout", r2_cutter_rev) + info = get_repo_info(dirname, version) timestamp = git(dirname, "log", "-n1", "--format=%at") - r2_cutter_version = datetime.fromtimestamp(int(timestamp)).strftime("%Y-%m-%d") - - r2_cutter_info = get_repo_info(dirname, r2_cutter_rev) in_block = False with fileinput.FileInput(nix_file, inplace=True) as f: @@ -140,8 +102,13 @@ def main() -> None: print( f""" # # DO NOT EDIT! Automatically generated by ./update.py - radare2 = {write_package_expr(radare2_rev, radare2_info)}; - r2-for-cutter = {write_package_expr(r2_cutter_version, r2_cutter_info)}; + gittap = "{info["gittap"]}"; + gittip = "{info["gittip"]}"; + rev = "{info["rev"]}"; + version = "{version}"; + sha256 = "{info["sha256"]}"; + cs_ver = "{info["cs_ver"]}"; + cs_sha256 = "{info["cs_sha256"]}"; #""" ) elif "#" in l: diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix new file mode 100644 index 00000000000..14d815f04b1 --- /dev/null +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -0,0 +1,46 @@ +{ fetchFromGitHub, lib, mkDerivation +# nativeBuildInputs +, qmake, pkg-config, cmake +# Qt +, qtbase, qtsvg, qtwebengine, qttools +# buildInputs +, rizin +, python3 +, wrapQtAppsHook +}: + +mkDerivation rec { + pname = "cutter"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "rizinorg"; + repo = "cutter"; + rev = "v${version}"; + sha256 = "sha256-uIN/NR+swu9Ie0wP2aBhw5WBvTe9NDmzSs+lQMCeavc="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake qmake pkg-config python3 wrapQtAppsHook ]; + propagatedBuildInputs = [ python3.pkgs.pyside2 ]; + buildInputs = [ qtbase qttools qtsvg qtwebengine rizin python3 ]; + + cmakeFlags = [ + "-DCUTTER_USE_BUNDLED_RIZIN=OFF" + "-DCUTTER_ENABLE_PYTHON=ON" + "-DCUTTER_ENABLE_PYTHON_BINDINGS=ON" + ]; + + preBuild = '' + qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Free and Open Source Reverse Engineering Platform powered by rizin"; + homepage = src.meta.homepage; + license = licenses.gpl3; + maintainers = with maintainers; [ mic92 dtzWill ]; + }; +} diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix new file mode 100644 index 00000000000..bbcc432ea99 --- /dev/null +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, libusb-compat-0_1 +, readline +, libewf +, perl +, zlib +, openssl +, libuv +, file +, libzip +, lz4 +, xxHash +, meson +, cmake +, ninja +, capstone +, tree-sitter +}: + +stdenv.mkDerivation rec { + pname = "rizin"; + version = "0.1.2"; + + src = fetchurl { + url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-${version}.tar.xz"; + sha256 = "sha256-npUp8wJiKAaQKSigXtndhJLTJ4+pyFqa0FwDLBqR/sE="; + }; + + mesonFlags = [ + "-Duse_sys_capstone=true" + "-Duse_sys_magic=true" + "-Duse_sys_libzip=true" + "-Duse_sys_zlib=true" + "-Duse_sys_xxhash=true" + "-Duse_sys_lz4=true" + "-Duse_sys_openssl=true" + "-Duse_sys_tree_sitter=true" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config meson ninja cmake ]; + + buildInputs = [ + file + libzip + capstone + readline + libusb-compat-0_1 + libewf + perl + zlib + lz4 + openssl + libuv + tree-sitter + xxHash + ]; + + meta = { + description = "UNIX-like reverse engineering framework and command-line toolset."; + homepage = "https://rizin.re/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ raskin makefu mic92 ]; + platforms = with lib.platforms; linux; + inherit version; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 04091466299..eed37dea32c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -608,6 +608,7 @@ mapAliases ({ qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15 rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 + radare2-cutter = cutter; rkt = throw "rkt was archived by upstream"; # added 2020-05-16 ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby"; ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6620c0f162..b794e617e33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13035,12 +13035,14 @@ in r10k = callPackage ../tools/system/r10k { }; - inherit (callPackages ../development/tools/analysis/radare2 ({ + radare2 = callPackage ../development/tools/analysis/radare2 ({ inherit (gnome2) vte; lua = lua5; - } // (config.radare or {}))) radare2 r2-for-cutter; + } // (config.radare or {})); - radare2-cutter = libsForQt515.callPackage ../development/tools/analysis/radare2/cutter.nix { }; + rizin = pkgs.callPackage ../development/tools/analysis/rizin { }; + + cutter = libsForQt515.callPackage ../development/tools/analysis/rizin/cutter.nix { }; ragel = ragelStable; From 19b0f5623dcff972baf2e7bc28eb6b62e1b14939 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 4 Apr 2021 00:00:00 +0000 Subject: [PATCH 07/89] laminar: use "pname" instead of "name" in mkDerivation --- .../tools/continuous-integration/laminar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index 9d78f57425a..5b492ee67b3 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -28,7 +28,7 @@ let sha256 = "1jh4h12qchsba03dx03mrvs4r8g9qfjn56xm56jqzgqf7r209xq9"; }; in stdenv.mkDerivation rec { - name = "laminar"; + pname = "laminar"; version = "1.0"; src = fetchurl { url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; From 71879498177f48478218574806d9b0ab08c3ad14 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 4 Apr 2021 13:05:19 +0200 Subject: [PATCH 08/89] hdf5: make possible to use the v1.10 API --- pkgs/tools/misc/hdf5/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 712fae7f71f..37ebbe630ca 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -10,6 +10,7 @@ , enableShared ? !stdenv.hostPlatform.isStatic , javaSupport ? false , jdk +, usev110Api ? false }: # cpp and mpi options are mutually exclusive @@ -50,7 +51,8 @@ stdenv.mkDerivation rec { ++ optional (szip != null) "--with-szlib=${szip}" ++ optionals mpiSupport ["--enable-parallel" "CC=${mpi}/bin/mpicc"] ++ optional enableShared "--enable-shared" - ++ optional javaSupport "--enable-java"; + ++ optional javaSupport "--enable-java" + ++ optional usev110Api "--with-default-api-version=v110"; patches = [ ./bin-mv.patch From 5196dcf353e0c2d048a5479a3ecb417e13e808dd Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 4 Apr 2021 13:05:49 +0200 Subject: [PATCH 09/89] vigra: use the HDF5 v1.10 API vigra is not yet compatible with the v1.12 API [0][1]. [0] https://github.com/ukoethe/vigra/issues/476 [1] https://github.com/ukoethe/vigra/issues/476 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2899a68bc5..0c4c579a754 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17623,7 +17623,9 @@ in inherit (llvmPackages) openmp; }; - vigra = callPackage ../development/libraries/vigra { }; + vigra = callPackage ../development/libraries/vigra { + hdf5 = hdf5.override { usev110Api = true; }; + }; vlock = callPackage ../misc/screensavers/vlock { }; From e067a4c91fe9259629ef0f94f5d49832fcd90a2f Mon Sep 17 00:00:00 2001 From: David Date: Mon, 5 Apr 2021 15:17:10 +0200 Subject: [PATCH 10/89] erlangR23: 23.2.6 -> 23.3.1 --- pkgs/development/interpreters/erlang/R23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 8c07c09f221..0e8e402ab3b 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.2.6"; - sha256 = "sha256-G930sNbr8h5ryI/IE+J6OKhR5ij68ZhGo1YIEjSOwGU="; + version = "23.3.1"; + sha256 = "1nx9yv3l8hf37js7pqs536ywy786mxhkqba1jsmy1b3yc6xki1mq"; } From 63bfd8f88dde0d5a5db99b7643b4229899087b2c Mon Sep 17 00:00:00 2001 From: David Date: Mon, 5 Apr 2021 15:19:55 +0200 Subject: [PATCH 11/89] rebar3: 3.14.2 -> 3.14.4 --- .../tools/build-managers/rebar3/default.nix | 43 ++++++++----------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 0c6450766b1..c2b10d823a3 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,7 +3,7 @@ tree }: let - version = "3.14.2"; + version = "3.14.4"; # Dependencies should match the ones in: # https://github.com/erlang/rebar3/blob/${version}/rebar.lock @@ -12,27 +12,27 @@ let bbmustache = fetchHex { pkg = "bbmustache"; version = "1.10.0"; - sha256 = "43effa3fd4bb9523157af5a9e2276c493495b8459fc8737144aa186cb13ce2ee"; + sha256 = "1vp27jqnq65a8iqp7j4z8nw9ad29dhky5agmg8aj75dvshzzmvs3"; }; certifi = fetchHex { pkg = "certifi"; - version = "2.5.2"; - sha256 = "3b3b5f36493004ac3455966991eaf6e768ce9884693d9968055aeeeb1e575040"; + version = "2.5.3"; + sha256 = "040w1scglvqhcvc1ifdnlcyrbwr0smi00w4xi8h03c99775nllgd"; }; cf = fetchHex { pkg = "cf"; version = "0.3.1"; - sha256 = "315e8d447d3a4b02bcdbfa397ad03bbb988a6e0aa6f44d3add0f4e3c3bf97672"; + sha256 = "0wknz4xkqkhgvlx4vx5619p8m65v7g87lfgsvfy04jrsgm28spii"; }; cth_readable = fetchHex { pkg = "cth_readable"; - version = "1.4.9"; - sha256 = "b4c6ababdb046c5f2fbb3c22f030b4c5a679083956dcdd29c1df0cb30b18da24"; + version = "1.5.0"; + sha256 = "0z58b6frqdnhyzrmbdf6x78l3izbbh5z5i3am8hqc253r7xwv0dx"; }; erlware_commons = fetchHex { pkg = "erlware_commons"; - version = "1.3.1"; - sha256 = "7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166"; + version = "1.4.0"; + sha256 = "1rp2vkgzqm6sax7fc13rh9x6qzxsgg718dnv7l0kmarvyifcyphq"; }; eunit_formatters = fetchHex { pkg = "eunit_formatters"; @@ -46,29 +46,26 @@ let }; parse_trans = fetchHex { pkg = "parse_trans"; - version = "3.3.0"; - sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"; + version = "3.3.1"; + sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87"; }; + providers = fetchHex { pkg = "providers"; version = "1.8.1"; - sha256 = "e45745ade9c476a9a469ea0840e418ab19360dc44f01a233304e118a44486ba0"; + sha256 = "183b9128l4af60rs40agqh6kc6db33j4027ad6jajxn4x6nlamz4"; }; + relx = fetchHex { pkg = "relx"; - version = "4.1.0"; - sha256 = "b94a3f96697a479ee5217a853345e0f4977bdf40d3c040af0d3d80fadad82af4"; + version = "4.3.0"; + sha256 = "0h044arh41sr92r1nlg176shavlv7pvw17alwklhszgwlr4hk3kk"; }; + ssl_verify_fun = fetchHex { pkg = "ssl_verify_fun"; version = "1.1.6"; - sha256 = "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"; - }; - - hex_core = fetchHex { - pkg = "hex_core"; - version = "0.7.1"; - sha256 = "05c60411511b6dc79affcd99a93e67d71e1b9d6abcb28ba75cd4ebc8585b8d02"; + sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x"; }; in stdenv.mkDerivation rec { @@ -81,7 +78,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = pname; rev = version; - sha256 = "02gz6xs8j5rm14r6dndcpdm8q3rl4mcj363gnnx4y5xvvfnv9bfa"; + sha256 = "09bnqwli93sq1pcz4h88ks7qg7k8yrjy9fd46yyp8xdl7i4irwy2"; }; bootstrapper = ./rebar3-nix-bootstrap; @@ -104,8 +101,6 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -R ${relx} _checkouts/relx cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun - cp --no-preserve=mode -R ${hex_core} _checkouts/hex_core - # Bootstrap script expects the dependencies in _build/default/lib # TODO: Make it accept checkouts? for i in _checkouts/* ; do From 93a484f72bf22e537a0956e3bf5e5a34ccf3a1ba Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 5 Apr 2021 20:55:31 +0300 Subject: [PATCH 12/89] =?UTF-8?q?viking:=201.8=20=E2=86=92=201.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/viking/default.nix | 67 +++++++++++------------ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 71f67baa6c5..72c0fefd4e6 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,60 +1,57 @@ -{ fetchurl, fetchpatch, lib, stdenv, makeWrapper -, pkg-config, intltool, gettext, gtk2, expat, curl -, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper -, docbook_xml_dtd_412, gexiv2, gpsbabel, expect +{ lib, stdenv, fetchurl +, docbook_xml_dtd_45, docbook_xsl, intltool, itstool, libxslt, pkg-config, wrapGAppsHook, yelp-tools +, curl, gdk-pixbuf, gtk3, json-glib, libxml2 +, gpsbabel +, withGeoClue ? true, geoclue2 +, withGeoTag ? true, gexiv2 +, withMagic ? true, file , withMapnik ? false, mapnik , withMBTiles ? true, sqlite -, withOAuth ? true, liboauth , withMd5Hash ? true, nettle -, withGeoClue ? true, geoclue2 }: +, withOAuth ? true, liboauth +, withRealtimeGPSTracking ? true, gpsd +}: stdenv.mkDerivation rec { pname = "viking"; - version = "1.8"; + version = "1.9"; src = fetchurl { - url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2"; - sha256 = "1a0g0fbj4q5s9p8fv0mqvxws10q3naj81l72sz30vvqpbz6vqp45"; + url = "mirror://sourceforge/viking/viking-${version}.tar.bz2"; + sha256 = "0fybpy6k0vmjp231h5ckysl3c0rcnh2afznijwq6y78j4hywyjpy"; }; - patches = [ - # Fix build without mapnik and sqlite https://github.com/viking-gps/viking/pull/79 - (fetchpatch { - url = "https://github.com/viking-gps/viking/commit/995feefcb97bdb1590ed018224cf47ce197fe0c1.patch"; - sha256 = "1xb0b76kg690fag9mw3yfj5k766jmqp1sm8q4f29n1h3nz5g8izd"; - }) - ]; + nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook yelp-tools ]; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils - libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 - ] ++ lib.optional withMapnik mapnik + buildInputs = [ curl gdk-pixbuf gtk3 json-glib libxml2 ] ++ lib.optional withGeoClue geoclue2 + ++ lib.optional withGeoTag gexiv2 + ++ lib.optional withMagic file + ++ lib.optional withMapnik mapnik + ++ lib.optional withMBTiles sqlite ++ lib.optional withMd5Hash nettle - ++ lib.optional withOAuth liboauth - ++ lib.optional withMBTiles sqlite; + ++ lib.optional withOAuth liboauth + ++ lib.optional withRealtimeGPSTracking gpsd; configureFlags = [ - "--disable-scrollkeeper" - (lib.enableFeature withMapnik "mapnik") (lib.enableFeature withGeoClue "geoclue") - (lib.enableFeature withMd5Hash "nettle") - (lib.enableFeature withOAuth "oauth") + (lib.enableFeature withGeoTag "geotag") + (lib.enableFeature withMagic "magic") + (lib.enableFeature withMapnik "mapnik") (lib.enableFeature withMBTiles "mbtiles") + (lib.enableFeature withMd5Hash "nettle") + (lib.enableFeature withOAuth "oauth") + (lib.enableFeature withRealtimeGPSTracking "realtime-gps-tracking") ]; - preBuild = '' - sed -i help/Makefile \ - -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g' - sed -i help/Makefile -e 's|--postvalid||g' - ''; + hardeningDisable = [ "format" ]; doCheck = true; - postInstall = '' - wrapProgram $out/bin/viking \ - --prefix PATH : "${gpsbabel}/bin" \ - --prefix PATH : "${expect}/bin" + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ gpsbabel ]} + ) ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74ec2651b48..2a585fae9c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9012,9 +9012,7 @@ in inherit lib udisks2 python3; }; - viking = callPackage ../applications/misc/viking { - inherit (gnome2) scrollkeeper; - }; + viking = callPackage ../applications/misc/viking { }; vim-vint = callPackage ../development/tools/vim-vint { }; From 0968946551ab215bcd5054c860ff1bbcdc13c44c Mon Sep 17 00:00:00 2001 From: wedens Date: Sat, 14 Nov 2020 23:05:17 +0700 Subject: [PATCH 13/89] vendor-reset: init at unstable-2021-02-16 --- .../linux/vendor-reset/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/os-specific/linux/vendor-reset/default.nix diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix new file mode 100644 index 00000000000..8f1bde7ecbd --- /dev/null +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, kernel, lib }: + +stdenv.mkDerivation rec { + name = "vendor-reset-${version}-${kernel.version}"; + version = "unstable-2021-02-16"; + + src = fetchFromGitHub { + owner = "gnif"; + repo = "vendor-reset"; + rev = "225a49a40941e350899e456366265cf82b87ad25"; + sha256 = "sha256-xa7P7+mRk4FVgi+YYCcsFLfyNqPmXvy3xhGoTDVqPxw="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + hardeningDisable = [ "pic" ]; + + makeFlags = [ + "KVER=${kernel.modDirVersion}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -D vendor-reset.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/misc/" + ''; + + meta = with lib; { + description = "Linux kernel vendor specific hardware reset module"; + homepage = "https://github.com/gnif/vendor-reset"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ wedens ]; + platforms = [ "x86_64-linux" ]; + broken = kernel.kernelOlder "4.19"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fd4f37b55c..973ec42f13c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19639,6 +19639,8 @@ in v86d = callPackage ../os-specific/linux/v86d { }; + vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; + vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; virtualbox = callPackage ../os-specific/linux/virtualbox { From 7ed8d11dc4fdeedb143840bfdb0878541d605c23 Mon Sep 17 00:00:00 2001 From: Lisa Ugray Date: Tue, 6 Apr 2021 15:34:39 -0400 Subject: [PATCH 14/89] ruby_3_0: 3.0.0 -> 3.0.1 --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b13c50f18d2..0522f6f397b 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -265,10 +265,10 @@ in { }; ruby_3_0 = generic { - version = rubyVersion "3" "0" "0" ""; + version = rubyVersion "3" "0" "1" ""; sha256 = { - src = "0a4fmxafxvkg1m738g2lmkhipwnmd96kzqy1m9kvk3n1l50x2gm1"; - git = "0fvnxv97m94nridlc5nvvrlg53pr5g042dkfc5ysd327s7xj4cjp"; + src = "09vpnxxcxc46qv40xbxr9xkdpbgb0imdy25l2vpsxxlr47djb61n"; + git = "0vricyhnnczcbsgvz65pdhi9yx1i34zarbjlc5y5mcmj01y9r7ar"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 3abba61bc24..dcd0a653836 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -11,7 +11,7 @@ "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "3.0.0" = ops useRailsExpress [ + "3.0.1" = ops useRailsExpress [ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; From 48a2307da5ee515177d963fd7bc4a2978552f162 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Tue, 6 Apr 2021 02:02:41 +0200 Subject: [PATCH 15/89] antsimulator: init at 1.2 --- pkgs/games/antsimulator/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/games/antsimulator/default.nix diff --git a/pkgs/games/antsimulator/default.nix b/pkgs/games/antsimulator/default.nix new file mode 100644 index 00000000000..b43b91d5cb9 --- /dev/null +++ b/pkgs/games/antsimulator/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, cmake, sfml }: + +stdenv.mkDerivation rec { + pname = "antsimulator"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "johnBuffer"; + repo = "AntSimulator"; + rev = "v${version}"; + sha256 = "0wz80971rf86kb7mcnxwrq75vriwhmyir5s5n3wzml12rzfnj5f1"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ sfml ]; + + installPhase = '' + mkdir -p $out/bin + install -Dm755 ./AntSimulator $out/bin/antsimulator + ''; + + meta = with lib; { + homepage = "https://github.com/johnBuffer/AntSimulator"; + description = "Simple Ants simulator"; + license = licenses.free; + maintainers = with maintainers; [ ivar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccf0f81f2a1..825e015d1e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -154,6 +154,8 @@ in ankisyncd = callPackage ../servers/ankisyncd { }; + antsimulator = callPackage ../games/antsimulator { }; + fiche = callPackage ../servers/fiche { }; fishnet = callPackage ../servers/fishnet { }; From 0e31f097742d84de7946c974be204f05b8383958 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Apr 2021 01:15:13 +0200 Subject: [PATCH 16/89] maintainers/team: add home-assistant team --- maintainers/team-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 8acf68ac3af..39c9b767187 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -87,6 +87,16 @@ with lib.maintainers; { scope = "Maintain GNOME desktop environment and platform."; }; + home-assistant = { + members = [ + fab + globin + hexa + mic92 + ]; + scope = "Maintain the Home Assistant ecosystem"; + }; + jitsi = { members = [ mmilata From dc8458345229e9d33353d4355d2a9a328ece93c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Apr 2021 01:16:25 +0200 Subject: [PATCH 17/89] home-assistant: Move maintainership to home-assistant team --- nixos/modules/services/misc/home-assistant.nix | 2 +- pkgs/servers/home-assistant/appdaemon.nix | 2 +- pkgs/servers/home-assistant/cli.nix | 2 +- pkgs/servers/home-assistant/default.nix | 2 +- pkgs/servers/home-assistant/frontend.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 31b6afb499e..f6398c08397 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -63,7 +63,7 @@ let }; in { - meta.maintainers = with maintainers; [ ]; + meta.maintainers = teams.home-assistant.members; options.services.home-assistant = { enable = mkEnableOption "Home Assistant"; diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 18865ee5ad7..5500a891200 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -82,6 +82,6 @@ in python.pkgs.buildPythonApplication rec { description = "Sandboxed Python execution environment for writing automation apps for Home Assistant"; homepage = "https://github.com/AppDaemon/appdaemon"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ] ++ teams.home-assistant.members; }; } diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index d7fdb6f89f1..da7ff1ed6b2 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication rec { description = "Command-line tool for Home Assistant"; homepage = "https://github.com/home-assistant/home-assistant-cli"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = teams.home-assistant.members; }; } diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2ae7a6c33fa..267306f4448 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -396,7 +396,7 @@ in with py.pkgs; buildPythonApplication rec { homepage = "https://home-assistant.io/"; description = "Open source home automation that puts local control and privacy first"; license = licenses.asl20; - maintainers = with maintainers; [ globin mic92 hexa ]; + maintainers = teams.home-assistant.members; platforms = platforms.linux; }; } diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 5841463e7c5..e62ee9b42b6 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Polymer frontend for Home Assistant"; homepage = "https://github.com/home-assistant/home-assistant-polymer"; license = licenses.asl20; - maintainers = with maintainers; [ globin ]; + maintainers = teams.home-assistant.members; }; } From df34ff2a7b2041c00f6a1b70fcc262993c66f73b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Apr 2021 15:51:34 +0200 Subject: [PATCH 18/89] appdaemon: remove peterhoeg from maintainers https://github.com/NixOS/nixpkgs/pull/118633\#discussion_r607862567 --- pkgs/servers/home-assistant/appdaemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 5500a891200..f805d45b212 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -82,6 +82,6 @@ in python.pkgs.buildPythonApplication rec { description = "Sandboxed Python execution environment for writing automation apps for Home Assistant"; homepage = "https://github.com/AppDaemon/appdaemon"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ] ++ teams.home-assistant.members; + maintainers = teams.home-assistant.members; }; } From 9f78dd4a1cb4b20c820ed98c7a69e9c6534fff71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 5 Apr 2021 03:40:16 +0200 Subject: [PATCH 19/89] fetchzip: accept urls Required after 9bbfb268540e0cc0404a6b9ef33ea3bf160066ed --- pkgs/build-support/fetchzip/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index b00983772e4..cde4d4f579f 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -5,16 +5,19 @@ # (e.g. due to minor changes in the compression algorithm, or changes # in timestamps). -{ fetchurl, unzip }: +{ lib, fetchurl, unzip }: { # Optionally move the contents of the unpacked tree up one level. stripRoot ? true -, url +, url ? "" +, urls ? [] , extraPostFetch ? "" , name ? "source" , ... } @ args: -(fetchurl ({ +(fetchurl (let + basename = baseNameOf (if url != "" then url else builtins.head urls); +in { inherit name; recursiveHash = true; @@ -27,7 +30,7 @@ mkdir "$unpackDir" cd "$unpackDir" - renamed="$TMPDIR/${baseNameOf url}" + renamed="$TMPDIR/${basename}" mv "$downloadedFile" "$renamed" unpackFile "$renamed" '' From 36c50a6f48127c1847b0bfb84006b034a851d3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 5 Apr 2021 03:40:27 +0200 Subject: [PATCH 20/89] paratype-pt-*: convert url -> urls Fixes eval after 9bbfb268540e0cc0404a6b9ef33ea3bf160066ed --- pkgs/data/fonts/paratype-pt/mono.nix | 2 +- pkgs/data/fonts/paratype-pt/sans.nix | 2 +- pkgs/data/fonts/paratype-pt/serif.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index 6b1cd370241..4dd6093922c 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -3,7 +3,7 @@ fetchzip { name = "paratype-pt-mono"; - url = [ + urls = [ "https://company.paratype.com/system/attachments/631/original/ptmono.zip" "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" ]; diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index d6b783ebe4c..8b47dd9ee1f 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -3,7 +3,7 @@ fetchzip { name = "paratype-pt-sans"; - url = [ + urls = [ "https://company.paratype.com/system/attachments/629/original/ptsans.zip" "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" ]; diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index 2b5eeafd09b..a4142f757fc 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -3,7 +3,7 @@ fetchzip { name = "paratype-pt-serif"; - url = [ + urls = [ "https://company.paratype.com/system/attachments/634/original/ptserif.zip" "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" ]; From 435fe3dab21326a4cd1aeb500672becc6c0b8a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 5 Apr 2021 03:41:37 +0200 Subject: [PATCH 21/89] sublime: url => urls Fixes eval after 9bbfb268540e0cc0404a6b9ef33ea3bf160066ed --- pkgs/applications/editors/sublime/2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index e46d6ef97e4..7102d695139 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "sublimetext-2.0.2.tar.bz2"; - url = [ + urls = [ "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" "https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { else fetchurl { name = "sublimetext-2.0.2.tar.bz2"; - url = [ + urls = [ "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" "https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2" ]; From f94c84f84481e6b3bc12eee3a8e2de444bc2594b Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Tue, 6 Apr 2021 22:58:49 +0300 Subject: [PATCH 22/89] pipewire: 0.3.24 -> 0.3.25 --- .../services/desktops/pipewire/bluez-monitor.conf.json | 8 +++++++- pkgs/development/libraries/pipewire/default.nix | 10 ++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json b/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json index 4d50cb9f1ad..bd00571bc35 100644 --- a/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json +++ b/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json @@ -8,7 +8,13 @@ } ], "actions": { - "update-props": {} + "update-props": { + "bluez5.reconnect-profiles": [ + "hfp_hf", + "hsp_hs", + "a2dp_sink" + ] + } } }, { diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index d685bde35ed..47a85c36c23 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , removeReferencesTo , meson , ninja @@ -43,7 +42,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.24"; + version = "0.3.25"; outputs = [ "out" @@ -61,7 +60,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - hash = "sha256:PcY20FTtUtJYAwCscEs+HfkdwDksYPFZIVTVORP1ooI="; + hash = "sha256:EbXWcf6QLtbvm6/eXBI+PF2sTw2opYfmc+H/SMDEH1U="; }; patches = [ @@ -75,11 +74,6 @@ let ./0070-installed-tests-path.patch # Add flag to specify configuration directory (different from the installation directory). ./0080-pipewire-config-dir.patch - # Fix JSON parser. - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/34800dc0191a4ee7a329eeb361a6f2ccf4a75176.diff"; - sha256 = "0dzxzr408qqzf0252nwg14709p1lb2k826i3kdzg6djq8w98d5aj"; - }) ]; nativeBuildInputs = [ From d4a5b28e3d9cfe31925ec37bfeb0c9195848d866 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Wed, 7 Apr 2021 17:48:33 +0300 Subject: [PATCH 23/89] noisetorch: 0.9.0 -> 0.10.1 --- pkgs/applications/audio/noisetorch/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index fea6e097de7..6f63bf542f4 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "NoiseTorch"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "lawl"; @@ -11,7 +11,10 @@ buildGoModule rec { sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg"; }; - patches = [ ./version.patch ]; + patches = [ + # Get version from environment instead of git tags + ./version.patch + ]; vendorSha256 = null; From 8a5bae4ef81dfc052d54812fbdb9d1712eb70c4e Mon Sep 17 00:00:00 2001 From: Bernard Fortz Date: Wed, 7 Apr 2021 17:24:24 +0200 Subject: [PATCH 24/89] bitwig-studio: 3.3.6 -> 3.3.7 --- pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index fac816649c7..28b5ef438e2 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "3.3.6"; + version = "3.3.7"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-k7L6CU2lY9192tfaWtVOxq9BCY7FZZdxmHT8EA+ZFsk="; + sha256 = "13jr45kzv0xjhhqk30qpq793349qyx8jpas4kl6i6bk3xfrd3fbz"; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; From a9053b687011d9bbce76b98f98b0feb3f4bc6afe Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Wed, 7 Apr 2021 18:06:45 +0200 Subject: [PATCH 25/89] gitkraken: 7.5.3 -> 7.5.4 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 4199cf0910f..63fd61f6671 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.5.3"; + version = "7.5.4"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0vxvfq0dh6l1plqbq67gfydr8bh5w3q6d5y3bn3rdia10wa1dac6"; + sha256 = "1laqki01zcmsl9s18dnwg3x3jbbs0xcipiyj2qlsb1sx9y4x05wm"; }; dontBuild = true; From b9ef51a84b746d577c0ec8f7472b475ca9eaceee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 7 Apr 2021 18:40:04 +0200 Subject: [PATCH 26/89] services.tailscale: add openresolv to path Without openresolv, magic dns is not very usable. --- nixos/modules/services/networking/tailscale.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 1a1474595be..9a28a266a92 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -28,6 +28,7 @@ in { systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { wantedBy = [ "multi-user.target" ]; + path = [ pkgs.openresolv ]; serviceConfig.Environment = "PORT=${toString cfg.port}"; }; }; From b85dd8136e96022a4bbfa8c1204d0326fe4bf133 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Apr 2021 01:41:57 +0200 Subject: [PATCH 27/89] home-assistant: error out if enabled component test does not exist Unfortunately enabling xdist hides the error away and the tests fail abruptly with no clear indication of what went wrong. Only after disabling xdist (`-n auto`, `--dist loadfile`) you would see > ERROR: file or directory not found: tests/components/openhome https://github.com/NixOS/nixpkgs/pull/118453#issuecomment-814491608 --- pkgs/servers/home-assistant/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2ae7a6c33fa..407bac84b5a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -383,6 +383,14 @@ in with py.pkgs; buildPythonApplication rec { preCheck = '' # the tests require the existance of a media dir mkdir /build/media + + # error out when component test directory is missing, otherwise hidden by xdist execution :( + for component in ${lib.concatStringsSep " " (map lib.escapeShellArg componentTests)}; do + test -d "tests/components/$component" || { + >2& echo "ERROR: Tests for component '$component' were enabled, but they do not exist!" + exit 1 + } + done ''; passthru = { From d63226c50d5009d9cac5861249435fa589a58ab9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Apr 2021 17:59:11 +0000 Subject: [PATCH 28/89] =?UTF-8?q?oh-my-zsh:=202021-04-06=20=E2=86=92=20202?= =?UTF-8?q?1-04-07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index e8064c5b77f..7f39b7d8226 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-04-06"; + version = "2021-04-07"; pname = "oh-my-zsh"; - rev = "1670f1cafcc919f35a2a52eaceeca315d293b679"; + rev = "3f50482674c2b3153590a4aba92fbfa1c01bc583"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1nphmg5sss860xhrc6iaiimzvfklb82kxwwivybh0ccyk2chb7i0"; + sha256 = "1ypx15p4c3mrs99xwkii3hwzlpk34mdldlymwiwad1c1ihw1r7r9"; }; installPhase = '' From 5452be4bc6ac0d5994b080e93bc87bf85bb447cc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Apr 2021 18:00:26 +0000 Subject: [PATCH 29/89] =?UTF-8?q?sbt-extras:=202021-03-29=20=E2=86=92=2020?= =?UTF-8?q?21-04-06?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/tools/build-managers/sbt-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index d4d4c755276..b49e5f7558a 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "b430596eb8566a59793ea0b8ddd2c693505e801f"; - version = "2021-03-29"; + rev = "a76f1f15e6ec39d886f8bf07d5bdfaf70cdc62d8"; + version = "2021-04-06"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "0r0ysv7dzrlmj3c82fv60i2490ky7q70jlv40q7zdmm5q2wp7y63"; + sha256 = "0zmhn8nvzrbw047g5z4q2slp0wdg6pvfh2pqnpwcq1hscf7dvz8f"; }; dontBuild = true; From 5e504f87a87bde464d26e7f00d353d09d5ad63e5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Apr 2021 18:01:25 +0000 Subject: [PATCH 30/89] =?UTF-8?q?jenkins:=202.277.1=20=E2=86=92=202.277.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 9807866f1bd..669dc846e10 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.277.1"; + version = "2.277.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0lficvngxzl7q088n3ssnnhjicd0xxr0k3n0inz7pvjj27dl35rr"; + sha256 = "08lv5v5kxp9ln798gjmh8j9a8r8xc471fbhiz2l7gxncpxn50ga2"; }; buildCommand = '' From 563451277f2a79fc933f487b1e7f1b563005f950 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 7 Apr 2021 11:18:46 -0700 Subject: [PATCH 31/89] fish: 3.2.1 -> 3.2.2 Replacing all occurrences of `/usr` with `/nix` doesn't work, because one test is just verifying if `wdirname` works (and `dirname /usr/lib` is not the same as `dirname /nix/lib`). --- pkgs/shells/fish/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index c467c04c3ff..b2677715d51 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -131,7 +131,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -141,14 +141,14 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "2OSfQJDTd43xfdgl5KKoAZIBVoJCPNndArZnXWXDr1s="; + sha256 = "WUTaGoiT0RsIKKT9kTbuF0VJ2v+z0K392JF4Vv5rQAk="; }; # Fix FHS paths in tests postPatch = '' # src/fish_tests.cpp sed -i 's|/bin/ls|${coreutils}/bin/ls|' src/fish_tests.cpp - sed -i 's|L"/usr"|L"/nix"|' src/fish_tests.cpp + sed -i 's|is_potential_path(L"/usr"|is_potential_path(L"/nix"|' src/fish_tests.cpp sed -i 's|L"/bin/echo"|L"${coreutils}/bin/echo"|' src/fish_tests.cpp sed -i 's|L"/bin/c"|L"${coreutils}/bin/c"|' src/fish_tests.cpp sed -i 's|L"/bin/ca"|L"${coreutils}/bin/ca"|' src/fish_tests.cpp From 55ddc94d92c92658be26baf24881f9556a35503c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 6 Apr 2021 08:47:18 +0200 Subject: [PATCH 32/89] =?UTF-8?q?ocamlPackages.ocamlnet:=204.1.8=20?= =?UTF-8?q?=E2=86=92=204.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ocamlnet/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 1da80a2202d..bdbbf1d8c67 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkg-config, ncurses, ocaml, findlib, ocaml_pcre, camlzip +{ stdenv, lib, fetchurl, pkg-config, which, ncurses, ocaml, findlib, ocaml_pcre, camlzip , gnutls, nettle }: @@ -8,14 +8,14 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocamlnet-${version}"; - version = "4.1.8"; + version = "4.1.9"; src = fetchurl { url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; - sha256 = "1x703mjqsv9nvffnkj5i36ij2s5zfvxxll2z1qj6a7p428b2yfnm"; + sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; createFindlibDestdir = true; From e66af6a67e2346548368faebb438b8bf5fc07a9d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 7 Apr 2021 08:04:16 +0200 Subject: [PATCH 33/89] =?UTF-8?q?reason:=203.6.2=20=E2=86=92=203.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/reason/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 2807ddb6b5f..2293c83cc02 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.6.2"; + pname = "ocaml${ocaml.version}-reason"; + version = "3.7.0"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "6017d6dd930f4989177c3f7c3c20cffbaabaa49a"; - sha256 = "17wkcl3r0ckhlki9fk0mcwbnd7kpkqm1h0xjw2j2x1097n470df0"; + rev = "daa11255cb4716ce1c370925251021bd6e3bd974"; + sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs"; }; nativeBuildInputs = [ makeWrapper ]; From cc6d25b0d3f0405c14301a36bd6408d2cc4a01d9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 7 Apr 2021 08:11:41 +0200 Subject: [PATCH 34/89] ocamlPackages.merlin-extend: use Dune 2 --- pkgs/development/ocaml-modules/merlin-extend/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/pkgs/development/ocaml-modules/merlin-extend/default.nix index 752fbc039fa..6d4fcad0977 100644 --- a/pkgs/development/ocaml-modules/merlin-extend/default.nix +++ b/pkgs/development/ocaml-modules/merlin-extend/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "merlin-extend"; version = "0.6"; + useDune2 = true; + src = fetchurl { url = "https://github.com/let-def/merlin-extend/releases/download/v${version}/merlin-extend-v${version}.tbz"; sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2"; From 03bd054f248185146a8538d5a7663ad1fd8fa011 Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Wed, 7 Apr 2021 12:40:20 -0600 Subject: [PATCH 35/89] terraform_0_14: 0.14.9 -> 0.14.10 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index d3aeee6bc68..6cd2cf52efc 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -157,8 +157,8 @@ in rec { }); terraform_0_14 = pluggable (generic { - version = "0.14.9"; - sha256 = "0r9d28mbj7h9prr39gm5kd49l7sm8l1ab9rwrkpyhwgr119zf35b"; + version = "0.14.10"; + sha256 = "05vfb8hzma3qxq4w1h25mmgv96g90if214zlar0sm9fq8zsvb1yw"; vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; From 2ea305eeb0603b0effa533299f84e54f389bea90 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Wed, 7 Apr 2021 20:44:20 +0200 Subject: [PATCH 36/89] wesnoth: 1.14.15 -> 1.14.16 --- pkgs/games/wesnoth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 205937028a7..6eedc446f53 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.15"; + version = "1.14.16"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-HbQy5yhNe6HFydipqh2wWcyLfIjbdRjcBQaqAOtBJsY="; + sha256 = "sha256-QMz7atxol18r//UNb6+H6xAAEQdR4hAN8UW0KeGSH1g="; }; nativeBuildInputs = [ cmake pkg-config ]; From 7b36a1ad090dbe66c3d4fb5d28b6ed49978d19e0 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 13:21:57 +0200 Subject: [PATCH 37/89] pythonPackages.fido2: 0.8.1 -> 0.9.1 --- pkgs/development/python-modules/fido2/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index ac8e912ba3d..1e1af8e9591 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -9,17 +9,27 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.8.1"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1hzprnd407g2xh9kyv8j8pq949hwr1snmg3fp65pqfbghzv6i424"; + hash = "sha256-hoDuJSOOIwdZbrOQCg+MDZzJEYkUbtgDlUTxo6ad/m4="; }; propagatedBuildInputs = [ six cryptography ]; checkInputs = [ mock pyfakefs ]; + # Testing with `python setup.py test` doesn't work: + # https://github.com/Yubico/python-fido2/issues/108#issuecomment-763513576 + checkPhase = '' + runHook preCheck + + python -m unittest discover -v + + runHook postCheck + ''; + pythonImportsCheck = [ "fido2" ]; meta = with lib; { From 0e489fbc97413394644271885ed4c49fafa3202b Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 13:43:11 +0200 Subject: [PATCH 38/89] python3Packages.aws-adfs: loosen fido2 version constraint --- pkgs/development/python-modules/aws-adfs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 2f9cd1a0b19..461ce9d90d9 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -44,7 +44,9 @@ buildPythonPackage rec { # Relax version constraint postPatch = '' - sed -i 's/coverage < 4/coverage/' setup.py + substituteInPlace setup.py \ + --replace 'coverage < 4' 'coverage' \ + --replace 'fido2>=0.8.1,<0.9.0' 'fido2>=0.8.1,<1.0.0' ''; # Test suite writes files to $HOME/.aws/, or /homeless-shelter if unset From c1c43413d6ab30f160c028cacea13f3181bd1439 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 20:19:29 +0200 Subject: [PATCH 39/89] python3Packages.solo-python: mark package as broken solo-python currently does not support fido2 >= v0.9. Hence, we mark the package as broken until upstream intoduces support. Starting point to track this issue: https://github.com/solokeys/solo-python/issues/110. --- pkgs/development/python-modules/solo-python/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 72546642009..8d84ce34eb9 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -60,5 +60,8 @@ homepage = "https://github.com/solokeys/solo-python"; maintainers = with maintainers; [ wucke13 ]; license = with licenses; [ asl20 mit ]; + # solo-python v0.0.27 does not support fido2 >= v0.9 + # https://github.com/solokeys/solo-python/issues/110 + broken = true; }; } From 1072da3e3ee2c7ec863aab18c79f5e29aa241065 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 13:23:50 +0200 Subject: [PATCH 40/89] yubikey-manager: 3.1.2 -> 4.0.1 --- pkgs/tools/misc/yubikey-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 07218d054df..d15483c8bad 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "3.1.2"; + version = "4.0.1"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - hash = "sha256-dwnIOuu0QyWRl6RSdyQw7dGsAZ4xpXpx6jOpCkp4efE="; + hash = "sha256-OxbKo5vwOBabU6/2hO4RMWiifo4IVIxz+DlcwP9xO/E="; }; propagatedBuildInputs = From 0ff4e2a61884c31f52d518ed31e3b77686d59217 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 17:25:03 +0200 Subject: [PATCH 41/89] pythonPackages.makefun: init at 1.11.2 --- .../python-modules/makefun/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/makefun/default.nix diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix new file mode 100644 index 00000000000..1f5596a46cc --- /dev/null +++ b/pkgs/development/python-modules/makefun/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchPypi +, buildPythonPackage +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "makefun"; + version = "1.11.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-2qNQpILtWLVyREPGUUMhkem5ewyDdDh50JExccaigIU="; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + # Disabling tests for now due to various (transitive) dependencies on modules + # from @smarie which are, as of yet, not part of nixpkgs. Also introduces + # a tricky dependency: makefun tests depend on pytest-cases, installing + # pytest-cases depends on makefun. + doCheck = false; + + pythonImportsCheck = [ "makefun" ]; + + meta = with lib; { + homepage = "https://github.com/smarie/python-makefun"; + description = "Small library to dynamically create python functions"; + license = licenses.bsd2; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10da6e1f33c..f4e9bd4d565 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4107,6 +4107,8 @@ in { mail-parser = callPackage ../development/python-modules/mail-parser { }; + makefun = callPackage ../development/python-modules/makefun { }; + Mako = callPackage ../development/python-modules/Mako { }; managesieve = callPackage ../development/python-modules/managesieve { }; From 042b7059c50826b39c4021686dc2f6e7f2fa5fce Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 7 Apr 2021 17:28:36 +0200 Subject: [PATCH 42/89] yubikey-manager: run tests --- pkgs/tools/misc/yubikey-manager/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index d15483c8bad..12b3aa0f05f 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -42,8 +42,7 @@ python3Packages.buildPythonPackage rec { --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"' ''; - # See https://github.com/NixOS/nixpkgs/issues/29169 - doCheck = false; + checkInputs = with python3Packages; [ pytestCheckHook makefun ]; meta = with lib; { homepage = "https://developers.yubico.com/yubikey-manager"; From cf42b2eb0f8e2b7b22b1257c0a2d7a2f6ea1f87c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 6 Apr 2021 10:42:56 +0200 Subject: [PATCH 43/89] ocamlPackages.sqlite3: use Dune 2 --- pkgs/development/ocaml-modules/sqlite3/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 1b8f9d629e3..90b469288c7 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,8 +1,9 @@ -{ lib, fetchurl, sqlite, pkg-config, buildDunePackage }: +{ lib, fetchurl, sqlite, pkg-config, buildDunePackage, dune-configurator }: buildDunePackage rec { pname = "sqlite3"; version = "5.0.2"; + useDune2 = true; minimumOCamlVersion = "4.05"; src = fetchurl { @@ -11,7 +12,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ sqlite ]; + buildInputs = [ dune-configurator sqlite ]; meta = with lib; { homepage = "http://mmottl.github.io/sqlite3-ocaml/"; From 34da7899c52e45b832807bfe836e893a8f8daa16 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 28 Mar 2021 00:03:01 -0300 Subject: [PATCH 44/89] pythonPackages.ronin: init at 1.1.1 --- .../python-modules/ronin/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/ronin/default.nix diff --git a/pkgs/development/python-modules/ronin/default.nix b/pkgs/development/python-modules/ronin/default.nix new file mode 100644 index 00000000000..c9b0a0d2561 --- /dev/null +++ b/pkgs/development/python-modules/ronin/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, blessings +, colorama +, glob2 +}: + +buildPythonPackage rec { + pname = "ronin"; + version = "1.1.1"; + + src = fetchPypi { + inherit version pname; + hash = "sha256-5gZ8S0NR4JzKBIdi/xYtVmFg9ObbCSkT7sz+OKWnK/U="; + }; + + propagatedBuildInputs = [ + blessings + colorama + glob2 + ]; + + pythonImportsCheck = [ + "ronin" + ]; + + meta = with lib; { + homepage = "https://github.com/tliron/ronin/"; + description = "A straightforward but powerful build system based on Ninja and Python"; + license = licenses.asl20; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2875eca59b3..5231a498a4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7302,6 +7302,8 @@ in { roombapy = callPackage ../development/python-modules/roombapy { }; + ronin = callPackage ../development/python-modules/ronin { }; + rope = callPackage ../development/python-modules/rope { }; ROPGadget = callPackage ../development/python-modules/ROPGadget { }; From 321f4d54f0a9a65e43091cbe995afe2bcc8486ed Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Apr 2021 13:56:06 -0400 Subject: [PATCH 45/89] python3Packages.botocore: 1.20.45 -> 1.20.46 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 4aac44470e2..7301ef5ae48 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.45"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.46"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-s6WbIcb0BNLF3LGiFphISlrBu+Y5ypey4PDhnFLC6+E="; + sha256 = "sha256-ULvD6TQcfaqCGduYw48mASoVHKiPomAUjlvzrcvLlUE="; }; propagatedBuildInputs = [ From 608bb089e902f3e7f9fde533c94921322a509b52 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Apr 2021 13:57:02 -0400 Subject: [PATCH 46/89] python3Packages.boto3: 1.17.45 -> 1.17.46 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index d1543c24b39..9fdd4f35d1b 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.45"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.46"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-7dMELrpeIZFKfQmcuKJfAJwMQqlSnJrE9bhSrVs6ys8="; + sha256 = "sha256-Xe4Vv5YepYTWgfrkLFADTIOXF+dFTD2pDLV6bFLpdTI="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 5152bc8337d8038b2d7208ca81ca0f245eb9a9b3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Apr 2021 13:58:31 -0400 Subject: [PATCH 47/89] awscli: 1.19.45 -> 1.19.46 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 81e340f5bcf..fe28df060a6 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.45"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.46"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-eYH8AbMYs9Pez+DfKS4OyhD39+vKQZ2uegMwi6qHr2w="; + sha256 = "sha256-Cs+VOgbW/x1vsgMPgUG6PRlqZcvzHQCIRYuR6AsSYP4="; }; # https://github.com/aws/aws-cli/issues/4837 From a4c701e7e3241d1949ba1e802cb2dd6c87a5ec32 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 7 Apr 2021 13:07:09 -0700 Subject: [PATCH 48/89] python3Packages.gdown: fix build, add missing six dep --- pkgs/development/python-modules/gdown/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 9af10727285..8195bb0d403 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -5,6 +5,7 @@ , requests , tqdm , setuptools +, six }: buildPythonApplication rec { @@ -16,7 +17,7 @@ buildPythonApplication rec { sha256 = "4b3a1301e57bfd8dce939bf25ef8fbb4b23967fd0f878eede328bdcc41386bac"; }; - propagatedBuildInputs = [ filelock requests tqdm setuptools ]; + propagatedBuildInputs = [ filelock requests tqdm setuptools six ]; checkPhase = '' $out/bin/gdown --help > /dev/null From 141ece8fe21136cb417b4fed94c9f6682b62937a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 7 Apr 2021 13:08:06 -0700 Subject: [PATCH 49/89] python3Packages.requests-aws4auth: fix build, add missing six dep --- .../development/python-modules/requests-aws4auth/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index a2e92283dc7..3267b0a7865 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -1,4 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi, python, requests }: +{ lib, buildPythonPackage, fetchPypi, python, requests, six }: + with lib; buildPythonPackage rec { pname = "requests-aws4auth"; @@ -9,7 +10,7 @@ buildPythonPackage rec { sha256 = "9a4a5f4a61c49f098f5f669410308ac5b0ea2682fd511ee3a4f9ff73b5bb275a"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests six ]; # pypi package no longer contains tests doCheck = false; From 547cbbe6a4fab70f6d75f37564d392f06eedeaf6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 7 Apr 2021 13:09:07 -0700 Subject: [PATCH 50/89] python3Packages.ec2instanceconnectcli: fix build, add missing cryptography dep --- pkgs/tools/virtualization/ec2instanceconnectcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix b/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix index 4068d71383c..16c10b5ae7f 100644 --- a/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix +++ b/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, boto3 }: +{ lib, buildPythonPackage, fetchPypi, boto3, cryptography }: buildPythonPackage rec { pname = "ec2instanceconnectcli"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "sha256-VaCyCnEhSx1I3bNo57p0IXf92+tO1tT7KSUXzO1IyIU="; }; - propagatedBuildInputs = [ boto3 ]; + propagatedBuildInputs = [ boto3 cryptography ]; # has no tests doCheck = false; From 730eabb12ac2b634789b573c5b92a01805c55d3d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 7 Apr 2021 15:39:11 -0400 Subject: [PATCH 51/89] zabbix: drop 3.0.32 which is no longer supported by upstream --- pkgs/servers/monitoring/zabbix/versions.nix | 5 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index b3cdca20b3b..842521cd34b 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -8,9 +8,4 @@ generic: { version = "4.0.29"; sha256 = "0qghx7r7rbyya79mfsvr5fqws2d8ffn86zfdkzdrnmyl0x25fr9y"; }; - - v30 = generic { - version = "3.0.32"; - sha256 = "1n9l0llmifmg5zzh2jzqax8y23ch7250v36bcfkpizvr8wji7xi7"; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f91dcbac132..22b9c054ba8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -829,6 +829,7 @@ mapAliases ({ ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08 yuzu = yuzu-mainline; # added 2021-01-25 + zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # added 2021-04-07 zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # added 2021-03-28 zdfmediathk = mediathekview; # added 2019-01-19 gnome_user_docs = gnome-user-docs; # added 2019-11-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36251139412..2a19291b27b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19196,7 +19196,6 @@ in zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); - zabbix30 = dontRecurseIntoAttrs (zabbixFor "v30"); zabbix = zabbix50; From 61ec21622b0f248215ab3eaf3ae5fed776a9daf8 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 7 Apr 2021 16:40:31 -0400 Subject: [PATCH 52/89] zabbix: 4.0.29 -> 4.0.30 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 842521cd34b..1b80405795c 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -5,7 +5,7 @@ generic: { }; v40 = generic { - version = "4.0.29"; - sha256 = "0qghx7r7rbyya79mfsvr5fqws2d8ffn86zfdkzdrnmyl0x25fr9y"; + version = "4.0.30"; + sha256 = "17h831a1rw245kz37pw5haxq09k9m76bf0bz0jgg9s0q1j7hvywh"; }; } From eabeeb79efcdde5630a6692a8680bb1dfd0892cc Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 7 Apr 2021 16:42:53 -0400 Subject: [PATCH 53/89] zabbix: 5.0.9 -> 5.0.10 --- pkgs/servers/monitoring/zabbix/agent2.nix | 2 +- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index c2b6c0bb54b..1deada43637 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -12,7 +12,7 @@ import ./versions.nix ({ version, sha256 }: modRoot = "src/go"; - vendorSha256 = "1ral3xg58x0lf5vl839nlabf443yzqnbrlzm0q127mvv412f5ajc"; + vendorSha256 = "07caz0jfy0r1vb1h9mhb169wyn949z9xj0pmvyamr2d8y3k3hbyd"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libiconv openssl pcre zlib ]; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 1b80405795c..b9f5ad1be24 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v50 = generic { - version = "5.0.9"; - sha256 = "16vwh01hlxmh9qg3d7q1vsmz3bwydk7v7da58d3764ldmh8ag199"; + version = "5.0.10"; + sha256 = "15kbbj1vclsys1z3ghcz9j5faz67k3z8yl81bn7bhmqaflavgicb"; }; v40 = generic { From 9b30cda2f6e301abc6f39e01902330d981b12a80 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 7 Apr 2021 16:52:15 +0200 Subject: [PATCH 54/89] gitlab: 13.9.4 -> 13.10.2 --- .../version-management/gitlab/data.json | 13 +- .../version-management/gitlab/default.nix | 6 +- .../version-management/gitlab/gitaly/Gemfile | 2 +- .../gitlab/gitaly/Gemfile.lock | 4 +- .../gitlab/gitaly/default.nix | 20 +- .../gitlab/gitaly/gemset.nix | 6 +- .../gitlab/gitlab-workhorse/default.nix | 18 +- .../version-management/gitlab/rubyEnv/Gemfile | 48 +- .../gitlab/rubyEnv/Gemfile.lock | 172 +- .../gitlab/rubyEnv/gemset.nix | 369 +++- .../version-management/gitlab/update.py | 9 +- .../version-management/gitlab/yarnPkgs.nix | 1776 ++++++++--------- .../ruby-modules/gem-config/default.nix | 6 +- 13 files changed, 1262 insertions(+), 1187 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index df9f2255368..bd07773f0de 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,12 @@ { - "version": "13.9.4", - "repo_hash": "0gwxjmph3ac5v0h5zz8664412yq09cka5p4amdbxk7hna24igksz", + "version": "13.10.2", + "repo_hash": "1q3qnfzhikbbsmzzbldwn6xvsyxr1jgv5lj7mgcji11j8qv1a625", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.9.4-ee", + "rev": "v13.10.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.9.4", - "GITLAB_PAGES_VERSION": "1.35.0", - "GITLAB_SHELL_VERSION": "13.17.0", - "GITLAB_WORKHORSE_VERSION": "8.63.2" + "GITALY_SERVER_VERSION": "13.10.2", + "GITLAB_PAGES_VERSION": "1.36.0", + "GITLAB_SHELL_VERSION": "13.17.0" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index b9c352a4eac..4cd64dc8ad9 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn -, fixup_yarn_lock, replace +, fixup_yarn_lock, replace, file }: let @@ -32,6 +32,10 @@ let openssl = x.openssl // { buildInputs = [ openssl ]; }; + ruby-magic-static = x.ruby-magic-static // { + buildInputs = [ file ]; + buildFlags = [ "--enable-system-libraries" ]; + }; }; groups = [ "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index d2b3d2ea0e1..00215cc55e9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rugged', '~> 1.0.1' +gem 'rugged', '~> 1.1' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.0.3.4' diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 83c5f20f73d..32d761f9f3f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -183,7 +183,7 @@ GEM rubocop-ast (0.2.0) parser (>= 2.7.0.1) ruby-progressbar (1.10.1) - rugged (1.0.1) + rugged (1.1.0) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) @@ -233,7 +233,7 @@ DEPENDENCIES rspec rspec-parameterized rubocop (~> 0.69) - rugged (~> 1.0.1) + rugged (~> 1.1) sentry-raven (~> 3.0) timecop diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 37e97522fad..260b3b49399 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -4,18 +4,6 @@ , libgit2, openssl, zlib, pcre, http-parser }: let - # libgit2 was updated to 1.1.0 in nixpkgs, but gitlab doesn't support that yet. - # See https://github.com/NixOS/nixpkgs/pull/106909 - libgit = libgit2.overrideAttrs (attrs: rec { - version = "1.0.0"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc"; - }; - }); - rubyEnv = bundlerEnv rec { name = "gitaly-env"; inherit ruby; @@ -33,17 +21,17 @@ let }; }; in buildGoModule rec { - version = "13.9.4"; + version = "13.10.2"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-6ocP4SMafvLI2jfvcB8jk1AemAI/TiBQ1iaVxK7I54A="; + sha256 = "sha256-5CjZs5tpEEsgQGBFa8BeZ7SDhIeGKqAHWwbR8hSoCPs="; }; - vendorSha256 = "10ssx0dvbzg70vr2sgnhzijnjxfw6533wdjxwakj62rpfayklp51"; + vendorSha256 = "sha256-8AopoiLmg6kfvYbZDOfFWBy1o5tbnxsKxSBX20OasIE="; passthru = { inherit rubyEnv; @@ -51,7 +39,7 @@ in buildGoModule rec { buildFlags = [ "-tags=static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; doCheck = false; postInstall = '' diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 7b4928918f6..90655ef9e93 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -829,10 +829,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn"; + sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; sanitize = { dependencies = ["crass" "nokogiri" "nokogumbo"]; @@ -953,4 +953,4 @@ }; version = "2.4.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 64e1668ba06..ff34a2d3595 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,18 +1,22 @@ { lib, fetchFromGitLab, git, buildGoModule }: - +let + data = (builtins.fromJSON (builtins.readFile ../data.json)); +in buildGoModule rec { pname = "gitlab-workhorse"; - version = "8.63.2"; + version = "13.10.2"; src = fetchFromGitLab { - owner = "gitlab-org"; - repo = "gitlab-workhorse"; - rev = "v${version}"; - sha256 = "1vjk7r7228p2gblx9nmqiz70ckbllg1p3bwkyfd4m49jhp13hryi"; + owner = data.owner; + repo = data.repo; + rev = data.rev; + sha256 = data.repo_hash; }; - vendorSha256 = "0hc02nxw5jp1mhpjcx1f2a2dfaq7ji4qkf5g7lbpd1rzhqwp6zsz"; + sourceRoot = "source/workhorse"; + + vendorSha256 = "sha256-UCkUSv1ZjDHmTFnETU8dz4moYRDCvy6AYTTfjHBGKeE="; buildInputs = [ git ]; buildFlagsArray = "-ldflags=-X main.Version=${version}"; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index ec253c37b3a..af00e6e7af6 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -17,7 +17,7 @@ gem 'default_value_for', '~> 3.4.0' # Supported DBs gem 'pg', '~> 1.1' -gem 'rugged', '~> 1.0.1' +gem 'rugged', '~> 1.1' gem 'grape-path-helpers', '~> 1.6.1' gem 'faraday', '~> 1.0' @@ -25,13 +25,13 @@ gem 'marginalia', '~> 1.10.0' # Authentication libraries gem 'devise', '~> 4.7.2' -# TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828) -gem 'bcrypt', '3.1.12' +gem 'bcrypt', '~> 3.1', '>= 3.1.14' gem 'doorkeeper', '~> 5.5.0.rc2' gem 'doorkeeper-openid_connect', '~> 1.7.5' gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' -gem 'omniauth-azure-oauth2', '~> 0.0.9' +gem 'omniauth-azure-activedirectory-v2', '~> 0.1' +gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.4' @@ -73,6 +73,9 @@ gem 'acme-client', '~> 2.0', '>= 2.0.6' # Browser detection gem 'browser', '~> 4.2' +# OS detection for usage ping +gem 'ohai', '~> 16.10' + # GPG gem 'gpgme', '~> 2.0.19' @@ -88,7 +91,7 @@ gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' # GraphQL API -gem 'graphql', '~> 1.11.4' +gem 'graphql', '~> 1.11.8' # NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771 # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: # https://gitlab.com/gitlab-org/gitlab/issues/31747 @@ -112,16 +115,16 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.8' +gem 'fog-aws', '~> 3.9' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.12' +gem 'gitlab-fog-google', '~> 1.13', require: 'fog/google' gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.0', require: false +gem 'gitlab-fog-azure-rm', '~> 1.0.1', require: false # for Google storage gem 'google-api-client', '~> 0.33' @@ -195,7 +198,7 @@ gem 'acts-as-taggable-on', '~> 7.0' gem 'sidekiq', '~> 5.2.7' gem 'sidekiq-cron', '~> 1.0' gem 'redis-namespace', '~> 1.7.0' -gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch' +gem 'gitlab-sidekiq-fetcher', '0.5.5', require: 'sidekiq-reliable-fetch' # Cron Parser gem 'fugit', '~> 1.2.1' @@ -233,10 +236,7 @@ gem 'connection_pool', '~> 2.0' gem 'redis-rails', '~> 5.0.2' # Discord integration -gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false - -# HipChat integration -gem 'hipchat', '~> 1.5.0' +gem 'discordrb-webhooks', '~> 3.4', require: false # Jira integration gem 'jira-ruby', '~> 2.1.4' @@ -274,7 +274,10 @@ gem 'licensee', '~> 9.14.1' gem 'charlock_holmes', '~> 0.7.7' # Detect mime content type from content -gem 'mimemagic', '~> 0.3.2' +gem 'ruby-magic-static', '~> 0.3.4' + +# Fake version of the gem to trick bundler +gem 'mimemagic', '~> 0.3.10' # Faster blank gem 'fast_blank' @@ -309,7 +312,7 @@ gem 'pg_query', '~> 1.3.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.14.0' +gem 'gitlab-labkit', '~> 0.16.1' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -321,7 +324,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.3', require: false, group: :development -gem 'batch-loader', '~> 1.4.0' +gem 'batch-loader', '~> 2.0.1' # Perf bar gem 'peek', '~> 1.1' @@ -341,7 +344,6 @@ end group :development do gem 'brakeman', '~> 4.2', require: false - gem 'danger', '~> 8.0.6', require: false gem 'lefthook', '~> 0.7', require: false gem 'letter_opener_web', '~> 1.3.4' @@ -375,9 +377,8 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 6.0.0', require: false + gem 'gitlab-styles', '~> 6.1.0', require: false - gem 'scss_lint', '~> 0.59.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -397,6 +398,11 @@ group :development, :test do gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false end +group :development, :test, :danger do + gem 'danger-gitlab', '~> 8.0', require: false + gem 'gitlab-dangerfiles', '~> 0.8.0', require: false +end + group :development, :test, :coverage do gem 'simplecov', '~> 0.18.5', require: false gem 'simplecov-cobertura', '~> 1.3.1', require: false @@ -433,7 +439,7 @@ end gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room' +gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' @@ -482,7 +488,7 @@ gem 'flipper', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'unleash', '~> 0.1.5' -gem 'gitlab-experiment', '~> 0.4.9' +gem 'gitlab-experiment', '~> 0.5.0' # Structured logging gem 'lograge', '~> 0.5' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 1b6701e8e3d..203d52ddb67 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -88,7 +88,7 @@ GEM asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.12) asciidoctor (>= 1.5.6, < 3.0.0) - ast (2.4.1) + ast (2.4.2) atlassian-jwt (0.2.0) jwt (~> 2.1.0) attr_encrypted (3.1.0) @@ -127,8 +127,8 @@ GEM nokogiri (~> 1.11.0.rc2) babosa (1.0.2) base32 (0.3.2) - batch-loader (1.4.0) - bcrypt (3.1.12) + batch-loader (2.0.1) + bcrypt (3.1.16) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) benchmark-memory (0.1.2) @@ -172,6 +172,14 @@ GEM cbor (0.5.9.6) character_set (1.4.0) charlock_holmes (0.7.7) + chef-config (16.10.17) + addressable + chef-utils (= 16.10.17) + fuzzyurl + mixlib-config (>= 2.2.12, < 4.0) + mixlib-shellout (>= 2.0, < 4.0) + tomlrb (~> 1.2) + chef-utils (16.10.17) childprocess (3.0.0) chunky_png (1.3.5) citrus (3.0.2) @@ -187,7 +195,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) connection_pool (2.2.2) contracts (0.11.0) cork (0.3.0) @@ -208,7 +216,7 @@ GEM css_parser (1.7.0) addressable daemons (1.3.1) - danger (8.0.6) + danger (8.2.3) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -220,7 +228,10 @@ GEM kramdown-parser-gfm (~> 1.0) no_proxy_fix octokit (~> 4.7) - terminal-table (~> 1) + terminal-table (>= 1, < 4) + danger-gitlab (8.0.0) + danger + gitlab (~> 4.2, >= 4.2.0) database_cleaner (1.7.0) debugger-ruby_core_source (1.3.8) deckar01-task_list (2.3.1) @@ -257,8 +268,8 @@ GEM diff-lcs (1.4.4) diff_match_patch (0.1.0) diffy (3.3.0) - discordrb-webhooks-blackst0ne (3.3.0) - rest-client (~> 2.0) + discordrb-webhooks (3.4.2) + rest-client (>= 2.0.0) docile (1.3.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -348,6 +359,8 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake + ffi-yajl (2.3.4) + libyajl2 (~> 1.2) flipper (0.17.1) flipper-active_record (0.17.1) activerecord (>= 4.2, < 7) @@ -363,7 +376,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.8.0) + fog-aws (3.9.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -373,12 +386,6 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.12.0) - fog-core (<= 2.1.0) - fog-json (~> 1.2) - fog-xml (~> 0.1.0) - google-api-client (>= 0.44.2, < 0.51) - google-cloud-env (~> 1.2) fog-json (1.2.0) fog-core multi_json (~> 1.10) @@ -403,6 +410,7 @@ GEM fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) + fuzzyurl (0.9.0) gemoji (3.0.1) gemojione (3.3.0) json @@ -423,38 +431,49 @@ GEM gitaly (13.9.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) + gitlab (4.16.1) + httparty (~> 0.14, >= 0.14.0) + terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-experiment (0.4.9) + gitlab-dangerfiles (0.8.0) + danger + gitlab-experiment (0.5.0) activesupport (>= 3.0) scientist (~> 1.5, >= 1.5.0) - gitlab-fog-azure-rm (1.0.0) + gitlab-fog-azure-rm (1.0.1) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.14.0) + gitlab-fog-google (1.13.0) + addressable (>= 2.7.0) + fog-core (<= 2.1.0) + fog-json (~> 1.2) + fog-xml (~> 0.1.0) + google-api-client (>= 0.44.2, < 0.51) + google-cloud-env (~> 1.2) + gitlab-labkit (0.16.1) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) - gitlab-pg_query (~> 1.3) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) + pg_query (~> 1.3) redis (> 3.0.0, < 5.0.0) - gitlab-license (1.3.0) - gitlab-mail_room (0.0.8) + gitlab-license (1.3.1) + gitlab-mail_room (0.0.9) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) - gitlab-pg_query (1.3.1) gitlab-pry-byebug (3.9.0) byebug (~> 11.0) pry (~> 0.13.0) - gitlab-sidekiq-fetcher (0.5.2) + gitlab-sidekiq-fetcher (0.5.5) sidekiq (~> 5) - gitlab-styles (6.0.0) - rubocop (~> 0.91.1) + gitlab-styles (6.1.0) + rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) rubocop-performance (~> 1.9.2) rubocop-rails (~> 2.9) @@ -520,7 +539,7 @@ GEM faraday (>= 1.0) faraday_middleware graphql-client - graphql (1.11.4) + graphql (1.11.8) graphql-client (0.16.0) activesupport (>= 3.0) graphql (~> 1.8) @@ -574,9 +593,6 @@ GEM railties (>= 5.0) heapy (0.2.0) thor - hipchat (1.5.2) - httparty - mimemagic html-pipeline (2.13.2) activesupport (>= 2) nokogiri (>= 1.4) @@ -598,7 +614,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.7) + i18n (1.8.9) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -668,6 +684,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) + libyajl2 (1.2.0) license_finder (6.0.0) bundler rubyzip (>= 1, < 3) @@ -711,12 +728,20 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) - mimemagic (0.3.5) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.5.0) minitest (5.11.3) + mixlib-cli (2.1.8) + mixlib-config (3.0.9) + tomlrb + mixlib-log (3.0.9) + mixlib-shellout (3.2.5) + chef-utils ms_rest (0.7.6) concurrent-ruby (~> 1.0) faraday (>= 0.9, < 2.0.0) @@ -737,10 +762,12 @@ GEM mustermann (>= 1.0.0) nap (1.1.0) nenv (0.3.0) - net-http-persistent (4.0.0) + net-http-persistent (4.0.1) connection_pool (~> 2.2) net-ldap (0.16.3) net-ntp (2.1.3) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.0.0) netrc (0.11.0) nio4r (2.5.4) @@ -764,6 +791,19 @@ GEM octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) + ohai (16.10.6) + chef-config (>= 12.8, < 17) + chef-utils (>= 16.0, < 17) + ffi (~> 1.9) + ffi-yajl (~> 2.2) + ipaddress + mixlib-cli (>= 1.7.0) + mixlib-config (>= 2.0, < 4.0) + mixlib-log (>= 2.0.1, < 4.0) + mixlib-shellout (>= 2.0, < 4.0) + plist (~> 3.1) + train-core + wmi-lite (~> 1.0) oj (3.10.6) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) @@ -776,6 +816,8 @@ GEM omniauth-authentiq (0.3.3) jwt (>= 1.5) omniauth-oauth2 (>= 1.5) + omniauth-azure-activedirectory-v2 (0.1.1) + omniauth-oauth2 omniauth-azure-oauth2 (0.0.10) jwt (>= 1.0, < 3.0) omniauth (~> 1.0) @@ -855,6 +897,7 @@ GEM railties (>= 4.0.0) pg (1.2.3) pg_query (1.3.0) + plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) @@ -1041,16 +1084,16 @@ GEM pg rails sqlite3 - rubocop (0.91.1) + rubocop (0.93.1) parallel (~> 1.10) - parser (>= 2.7.1.1) + parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.7) + regexp_parser (>= 1.8) rexml - rubocop-ast (>= 0.4.0, < 1.0) + rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.8.0) + rubocop-ast (1.4.1) parser (>= 2.7.1.5) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) @@ -1068,6 +1111,8 @@ GEM i18n ruby-fogbugz (0.2.1) crack (~> 0.4) + ruby-magic-static (0.3.5) + mini_portile2 (~> 2.5.0) ruby-prof (1.3.1) ruby-progressbar (1.11.0) ruby-saml (1.7.2) @@ -1079,7 +1124,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (2.0.0) - rugged (1.0.1) + rugged (1.1.0) safe_yaml (1.0.4) safety_net_attestation (0.4.0) jwt (~> 2.0) @@ -1104,9 +1149,7 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - scientist (1.5.0) - scss_lint (0.59.0) - sass (~> 3.5, >= 3.5.5) + scientist (1.6.0) securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) @@ -1196,9 +1239,17 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) + tomlrb (1.3.0) tpm-key_attestation (0.9.0) bindata (~> 2.4) openssl-signature_algorithm (~> 0.4.0) + train-core (3.4.9) + addressable (~> 2.5) + ffi (!= 1.13.0) + json (>= 1.8, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + net-scp (>= 1.2, < 4.0) + net-ssh (>= 2.9, < 7.0) truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) @@ -1235,7 +1286,7 @@ GEM validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) - validate_url (1.0.8) + validate_url (1.0.13) activemodel (>= 3.0.0) public_suffix validates_hostname (1.0.11) @@ -1271,6 +1322,7 @@ GEM expression_parser rinku with_env (1.1.0) + wmi-lite (1.0.5) xml-simple (1.1.5) xpath (3.2.0) nokogiri (~> 1.8) @@ -1302,8 +1354,8 @@ DEPENDENCIES aws-sdk-s3 (~> 1) babosa (~> 1.0.2) base32 (~> 0.3.0) - batch-loader (~> 1.4.0) - bcrypt (= 3.1.12) + batch-loader (~> 2.0.1) + bcrypt (~> 3.1, >= 3.1.14) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) @@ -1324,7 +1376,7 @@ DEPENDENCIES countries (~> 3.0) creole (~> 0.5.0) crystalball (~> 0.7.0) - danger (~> 8.0.6) + danger-gitlab (~> 8.0) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) default_value_for (~> 3.4.0) @@ -1335,7 +1387,7 @@ DEPENDENCIES devise-two-factor (~> 3.1.0) diff_match_patch (~> 0.1.0) diffy (~> 3.3) - discordrb-webhooks-blackst0ne (~> 3.3) + discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5.0.rc2) doorkeeper-openid_connect (~> 1.7.5) ed25519 (~> 1.2) @@ -1356,9 +1408,8 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.17.1) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.8) + fog-aws (~> 3.9) fog-core (= 2.1.0) - fog-google (~> 1.12) fog-local (~> 0.6) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) @@ -1371,16 +1422,18 @@ DEPENDENCIES gitaly (~> 13.9.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-experiment (~> 0.4.9) - gitlab-fog-azure-rm (~> 1.0) - gitlab-labkit (= 0.14.0) + gitlab-dangerfiles (~> 0.8.0) + gitlab-experiment (~> 0.5.0) + gitlab-fog-azure-rm (~> 1.0.1) + gitlab-fog-google (~> 1.13) + gitlab-labkit (~> 0.16.1) gitlab-license (~> 1.3) - gitlab-mail_room (~> 0.0.8) + gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-pry-byebug - gitlab-sidekiq-fetcher (= 0.5.2) - gitlab-styles (~> 6.0.0) + gitlab-sidekiq-fetcher (= 0.5.5) + gitlab-styles (~> 6.1.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) @@ -1393,7 +1446,7 @@ DEPENDENCIES grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphlient (~> 0.4.0) - graphql (~> 1.11.4) + graphql (~> 1.11.8) graphql-docs (~> 1.6.0) grpc (~> 1.30.2) gssapi @@ -1404,7 +1457,6 @@ DEPENDENCIES hashie hashie-forbidden_attributes health_check (~> 3.0) - hipchat (~> 1.5.0) html-pipeline (~> 2.13.2) html2text httparty (~> 0.16.4) @@ -1433,7 +1485,7 @@ DEPENDENCIES marginalia (~> 1.10.0) memory_profiler (~> 0.9) method_source (~> 1.0) - mimemagic (~> 0.3.2) + mimemagic (~> 0.3.10) mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) @@ -1443,11 +1495,13 @@ DEPENDENCIES nokogiri (~> 1.11.1) oauth2 (~> 1.4) octokit (~> 4.15) + ohai (~> 16.10) oj (~> 3.10.6) omniauth (~> 1.8) omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) + omniauth-azure-activedirectory-v2 (~> 0.1) omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) omniauth-facebook (~> 4.0.0) @@ -1505,14 +1559,14 @@ DEPENDENCIES rspec_junit_formatter rspec_profiling (~> 0.0.6) ruby-fogbugz (~> 0.2.1) + ruby-magic-static (~> 0.3.4) ruby-prof (~> 1.3.0) ruby-progressbar (~> 1.10) ruby_parser (~> 3.15) rubyzip (~> 2.0.0) - rugged (~> 1.0.1) + rugged (~> 1.1) sanitize (~> 5.2.1) sassc-rails (~> 2.1.0) - scss_lint (~> 0.59.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) sentry-raven (~> 3.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 64d38a9a274..f6c26777f4f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -285,10 +285,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.2"; }; atlassian-jwt = { dependencies = ["jwt"]; @@ -475,20 +475,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09jaxxddqpgq8ynwd2gpjq5rkhw00zdjnqisk9qbpjgxzk6f8gwi"; + sha256 = "17d8wwj880zar5h8zxdmw878shgmljmmv957802fw5nkg3gi3xwk"; type = "gem"; }; - version = "1.4.0"; + version = "2.0.1"; }; bcrypt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy"; + sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb"; type = "gem"; }; - version = "3.1.12"; + version = "3.1.16"; }; bcrypt_pbkdf = { groups = ["ed25519"]; @@ -703,6 +703,27 @@ }; version = "0.7.7"; }; + chef-config = { + dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z3lashvhqy9v5b3xn8vzzf07gnjw4mgdiiryxsg6kdasvj62j8z"; + type = "gem"; + }; + version = "16.10.17"; + }; + chef-utils = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cypir7fza7jfqaj1j1jh37d3i6bvrmm6jamjlngk3xbdbd56hm7"; + type = "gem"; + }; + version = "16.10.17"; + }; childprocess = { groups = ["default" "test"]; platforms = []; @@ -805,10 +826,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; connection_pool = { groups = ["default"]; @@ -928,14 +949,25 @@ }; danger = { dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"]; - groups = ["development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrifb0kbjk9033pzjnp8qqqkg2z212h8dgj71k15c6wb6rycqa7"; + sha256 = "1nv02gq90nngnfa6hgiyyk60a31xfayk67va98k41gy9arhdkz5g"; type = "gem"; }; - version = "8.0.6"; + version = "8.2.3"; + }; + danger-gitlab = { + dependencies = ["danger" "gitlab"]; + groups = ["danger" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a530kx5s5rbx5yx3jqay56lkksqh0yj468hcpg16faiyv8dfza9"; + type = "gem"; + }; + version = "8.0.0"; }; database_cleaner = { groups = ["development" "test"]; @@ -1087,16 +1119,16 @@ }; version = "3.3.0"; }; - discordrb-webhooks-blackst0ne = { + discordrb-webhooks = { dependencies = ["rest-client"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f0dw6ci5cbrxrvvqw2kqabpzyjisd4hflbi370rpb4cakkzgw39"; + sha256 = "0viw73jd9vs9f92a9q2vxcd29755h7w8jwz36jmvcdl2najainyg"; type = "gem"; }; - version = "3.3.0"; + version = "3.4.2"; }; docile = { groups = ["default" "development" "test"]; @@ -1563,6 +1595,17 @@ }; version = "1.0.1"; }; + ffi-yajl = { + dependencies = ["libyajl2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pfmn0gprc3c15baxa9rx64pqllk64m60f5vg4gp0icpafkp0jx5"; + type = "gem"; + }; + version = "2.3.4"; + }; flipper = { groups = ["default"]; platforms = []; @@ -1623,10 +1666,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7n8r03akjbdz3r2bgsl6wcjvdlf0k508z8bsd9zgs43qg14vc9"; + sha256 = "10y32rm3vcfh82p2fdr2zq8ibknx1jslmai5m0r261bdr3brkssm"; type = "gem"; }; - version = "3.8.0"; + version = "3.9.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1639,17 +1682,6 @@ }; version = "2.1.0"; }; - fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cl6rprichdn1i40c2ndri1c53cfb0x2xk58l9arwip9ivkasln4"; - type = "gem"; - }; - version = "1.12.0"; - }; fog-json = { dependencies = ["fog-core" "multi_json"]; groups = ["default"]; @@ -1737,6 +1769,16 @@ }; version = "2.2.0"; }; + fuzzyurl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03qchs33vfwbsv5awxg3acfmlcrf5xbhnbrc83fdpamwya0glbjl"; + type = "gem"; + }; + version = "0.9.0"; + }; gemoji = { groups = ["default" "development" "test"]; platforms = []; @@ -1834,6 +1876,17 @@ }; version = "1.7.0"; }; + gitlab = { + dependencies = ["httparty" "terminal-table"]; + groups = ["danger" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kq77304vn733xc8iipq4wpdk5qb0zwjryhm3fia3mfsrdcp1z8k"; + type = "gem"; + }; + version = "4.16.1"; + }; gitlab-chronic = { dependencies = ["numerizer"]; groups = ["default"]; @@ -1845,16 +1898,27 @@ }; version = "0.10.5"; }; + gitlab-dangerfiles = { + dependencies = ["danger"]; + groups = ["danger" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09ggs890b5gfphnz7ayavs55l6xhw323spfd22dg246g0rw9vliy"; + type = "gem"; + }; + version = "0.8.0"; + }; gitlab-experiment = { dependencies = ["activesupport" "scientist"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skqg90i6qdpm7dhy8bv99gk8siwgm6mpr675790ngri1ns4f5xk"; + sha256 = "0x4hyva7ypi2mx5jcyxac8w7ffai1pkkjc49fk3avqh4aimlibfr"; type = "gem"; }; - version = "0.4.9"; + version = "0.5.0"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -1862,41 +1926,52 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04l7ps0vvrqq8i25q7ic2zy2n8f8f1l7sn1shf5wccy1cbyj9pig"; + sha256 = "05yc5fp45v7y6h838zrj4666ar1ddhn8i5bbdxm8j73yrn2kjnal"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; - gitlab-labkit = { - dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"]; + gitlab-fog-google = { + dependencies = ["addressable" "fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l4sbvlk6qc0x8372rp1gc2ihmx3vp0afrm5cy55xhflq16y7sl1"; + sha256 = "0ybmiclsdpkp1l91z6d4qkhha6cik6kgf4kzs3a2c26mhnnj6gxy"; type = "gem"; }; - version = "0.14.0"; + version = "1.13.0"; + }; + gitlab-labkit = { + dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03i8fc1yzm5yzqxb8bxhjkhqpj17fy71vg2z02bcj4mzbj0piflx"; + type = "gem"; + }; + version = "0.16.1"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04846kr8pw0fkw4mavakai978raq5d2kjna4rawxpc3dqlr897g4"; + sha256 = "01z5pb6fg1j83p73vys2fhj7qh60zkqbgiyp4nvw013a6hjlv3qk"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; gitlab-mail_room = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05j8rpsbl2l5q4xnfh2cnws9axy1a19asg8nlw6jngba94raw5ir"; + sha256 = "0745kls2bazgk6kbmlq1dmd42z8bgxkyn6ki9snxka8abi5kf037"; type = "gem"; }; - version = "0.0.8"; + version = "0.0.9"; }; gitlab-markup = { groups = ["default"]; @@ -1918,16 +1993,6 @@ }; version = "0.9.1"; }; - gitlab-pg_query = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rybirjyclavp641qdx27483xx0zpmc577wdzfgdnjd7753bya7g"; - type = "gem"; - }; - version = "1.3.1"; - }; gitlab-pry-byebug = { dependencies = ["byebug" "pry"]; groups = ["development" "test"]; @@ -1949,10 +2014,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dvx2klf1a1xyf15q34fn59291v6jwx3z315rxb2dmkvcr9873m1"; + sha256 = "055v0cxvxgy12iwhqa2xbsxa9j6ww7p1f5jqwncwsnr7l6f1f4c9"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.5"; }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; @@ -1960,10 +2025,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17d238cy031gnjmrk6wl3qyk5kqhqjxrb68813n4y9ia817xmwyp"; + sha256 = "0y3livdpkdzp4cy47ycpwqa7nhrf6fb1ff2lwhh4l5n4dpqympwn"; type = "gem"; }; - version = "6.0.0"; + version = "6.1.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2145,10 +2210,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ldxhn59lfg5ivxc9m11v1qhw29ql95qcvwwcap49n0z7d1i3k5"; + sha256 = "0rm59b6klp97287h01aj8hr12mhsya585as2z1sk8hq2lp51imfn"; type = "gem"; }; - version = "1.11.4"; + version = "1.11.8"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2332,17 +2397,6 @@ }; version = "0.2.0"; }; - hipchat = { - dependencies = ["httparty" "mimemagic"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; - type = "gem"; - }; - version = "1.5.2"; - }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; groups = ["default" "development" "test"]; @@ -2455,10 +2509,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.8.7"; + version = "1.8.9"; }; i18n_data = { groups = ["default"]; @@ -2758,6 +2812,16 @@ }; version = "1.3.4"; }; + libyajl2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi"; + type = "gem"; + }; + version = "1.2.0"; + }; license_finder = { dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"]; groups = ["development" "omnibus" "test"]; @@ -2953,14 +3017,15 @@ version = "3.2020.0512"; }; mimemagic = { + dependencies = ["nokogiri" "rake"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf"; + sha256 = "0cqm9n9122qpksn9v6mp0gn3lrzxhh72lwl7yb6j75gykdan6h41"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.10"; }; mini_histogram = { groups = ["default" "test"]; @@ -3012,6 +3077,48 @@ }; version = "5.11.3"; }; + mixlib-cli = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6"; + type = "gem"; + }; + version = "2.1.8"; + }; + mixlib-config = { + dependencies = ["tomlrb"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; + type = "gem"; + }; + version = "3.0.9"; + }; + mixlib-log = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n5dm5iz90ijvjn59jfm8gb8hgsvbj0f1kpzbl38b02z0z4a4v7x"; + type = "gem"; + }; + version = "3.0.9"; + }; + mixlib-shellout = { + dependencies = ["chef-utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g99c3s5zvrwvlv3gjw5fvpdimybpfazqyszjim5kdjjbq0586hj"; + type = "gem"; + }; + version = "3.2.5"; + }; ms_rest = { dependencies = ["concurrent-ruby" "faraday" "timeliness"]; groups = ["default"]; @@ -3132,10 +3239,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sbdvkn7mzl883iykz74hgp14qj041gldf2vdk9g3gyqc843l2vr"; + sha256 = "1yfypmfg1maf20yfd22zzng8k955iylz7iip0mgc9lazw36g8li7"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; net-ldap = { groups = ["default"]; @@ -3157,6 +3264,17 @@ }; version = "2.1.3"; }; + net-scp = { + dependencies = ["net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b4h3ip8d1gkrc0znnw54hbxillk73mdnaf5pz330lmrcl1wiilg"; + type = "gem"; + }; + version = "3.0.0"; + }; net-ssh = { groups = ["default"]; platforms = []; @@ -3272,6 +3390,17 @@ }; version = "4.20.0"; }; + ohai = { + dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08pc5l9p741g08x7xzbkkyi2kz5m5xr8rdj6hfna9bjzb1p80ddq"; + type = "gem"; + }; + version = "16.10.6"; + }; oj = { groups = ["default"]; platforms = []; @@ -3326,6 +3455,17 @@ }; version = "0.3.3"; }; + omniauth-azure-activedirectory-v2 = { + dependencies = ["omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bgdyzjh7x9knkzaa6bl9f5fvh05nd0gqxrqassww0vqh5qgyfpy"; + type = "gem"; + }; + version = "0.1.1"; + }; omniauth-azure-oauth2 = { dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; groups = ["default"]; @@ -3667,6 +3807,16 @@ }; version = "1.3.0"; }; + plist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; + type = "gem"; + }; + version = "3.6.0"; + }; png_quantizator = { groups = ["development" "test"]; platforms = []; @@ -4479,10 +4629,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19nmdwz6mc5ah0xqlj1j58ylcp9zsckb1xm7p1z51abnqhcq5c06"; + sha256 = "0phrig25dykgi42z6mf1abllh3ws6sv7awa82hzvvvbjx2xlzd3k"; type = "gem"; }; - version = "0.91.1"; + version = "0.93.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -4490,10 +4640,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "165ws2vwnw33nlqgzvzzjjp1zhkc712a92lbpbjx8j83g44dmdy4"; + sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; type = "gem"; }; - version = "0.8.0"; + version = "1.4.1"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -4561,6 +4711,17 @@ }; version = "0.2.1"; }; + ruby-magic-static = { + dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0whs2i868g1bgglrxl6aba47h8n9zqglsipskk6l83rfkm85ik3g"; + type = "gem"; + }; + version = "0.3.5"; + }; ruby-prof = { groups = ["default"]; platforms = []; @@ -4658,10 +4819,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn"; + sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; safe_yaml = { groups = ["default" "test"]; @@ -4755,21 +4916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09565ppvd851zxpspn5d5q28wqkfjyfxhvda9w80i16p3y937155"; + sha256 = "0jklwk9aldvlmdv17m77g2f82j383alqd4jjnwn4c564q9wvz3fp"; type = "gem"; }; - version = "1.5.0"; - }; - scss_lint = { - dependencies = ["sass"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s6dzk4n9pnmqciliggwpiny43vc3cx3n2d5gqa9aqng77ff7yv7"; - type = "gem"; - }; - version = "0.59.0"; + version = "1.6.0"; }; securecompare = { groups = ["default"]; @@ -5273,6 +5423,16 @@ }; version = "1.0.0"; }; + tomlrb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8"; + type = "gem"; + }; + version = "1.3.0"; + }; tpm-key_attestation = { dependencies = ["bindata" "openssl-signature_algorithm"]; groups = ["default"]; @@ -5284,6 +5444,17 @@ }; version = "0.9.0"; }; + train-core = { + dependencies = ["addressable" "ffi" "json" "mixlib-shellout" "net-scp" "net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pbfbmi9l5hxr1zly1bc72fk8a6by4d19wdap8q3mi3rlflqzbfp"; + type = "gem"; + }; + version = "3.4.9"; + }; truncato = { dependencies = ["htmlentities" "nokogiri"]; groups = ["default"]; @@ -5459,10 +5630,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k0bfxzvdcf1nrqhvnyhijc4mwab9wn4qvqb0ynq6p8dj0f866zi"; + sha256 = "1bwj34rz7961rrl545f006m2jdz1nrc0m72gfqmnb41xwsvpagbk"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.13"; }; validates_hostname = { dependencies = ["activerecord" "activesupport"]; @@ -5591,6 +5762,16 @@ }; version = "1.1.0"; }; + wmi-lite = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "110dv4arvwyky6f2pq19f20f1xcjpiz3zfbals0y49ijpq8agvql"; + type = "gem"; + }; + version = "1.0.5"; + }; xml-simple = { groups = ["default" "development" "test"]; platforms = []; @@ -5632,4 +5813,4 @@ }; version = "2.4.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index f662bd3097f..b84846c88ab 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -68,7 +68,7 @@ class GitLabRepo: version = self.rev2version(rev) passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION', - 'GITLAB_SHELL_VERSION', 'GITLAB_WORKHORSE_VERSION']} + 'GITLAB_SHELL_VERSION']} return dict(version=self.rev2version(rev), repo_hash=self.get_git_hash(rev), owner=self.owner, @@ -181,19 +181,14 @@ def update_gitlab_shell(): gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION'] _call_nix_update('gitlab-shell', gitlab_shell_version) - repo = GitLabRepo(repo='gitlab-shell') - gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell' - @cli.command('update-gitlab-workhorse') def update_gitlab_workhorse(): """Update gitlab-workhorse""" data = _get_data_json() - gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION'] + gitlab_workhorse_version = data['version'] _call_nix_update('gitlab-workhorse', gitlab_workhorse_version) - repo = GitLabRepo('gitlab-org', 'gitlab-workhorse') - gitlab_workhorse_dir = pathlib.Path(__file__).parent / 'gitlab-workhorse' @cli.command('update-all') @click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 916f5f60279..8084d2ebb6d 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -2,11 +2,19 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; - sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; + }; + } + { + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; }; } { @@ -18,19 +26,19 @@ }; } { - name = "_babel_core___core_7.10.2.tgz"; + name = "_babel_core___core_7.12.13.tgz"; path = fetchurl { - name = "_babel_core___core_7.10.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz"; - sha1 = "bd6786046668a925ac2bd2fd95b579b92a23b36a"; + name = "_babel_core___core_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.13.tgz"; + sha1 = "b73a87a3a3e7d142a66248bf6ad88b9ceb093425"; }; } { - name = "_babel_generator___generator_7.11.6.tgz"; + name = "_babel_generator___generator_7.12.15.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.11.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz"; - sha1 = "b868900f81b163b4d464ea24545c61cbac4dc620"; + name = "_babel_generator___generator_7.12.15.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz"; + sha1 = "4617b5d0b25cc572474cc1aafee1edeaf9b5368f"; }; } { @@ -90,19 +98,19 @@ }; } { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; - sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; }; } { @@ -114,35 +122,35 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; - sha1 = "ae69c83d84ee82f4b42f96e2a09410935a8f26df"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz"; + sha1 = "c5715695b4f8bab32660dbdcdc2341dec7e3df40"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; - sha1 = "4c5c54be04bd31670a7382797d75b9fa2e5b5620"; + name = "_babel_helper_module_imports___helper_module_imports_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz"; + sha1 = "ec67e4404f41750463e455cc3203f6a32e93fcb0"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; - sha1 = "b16f250229e47211abdd84b34b64737c2ab2d359"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz"; + sha1 = "01afb052dcad2044289b7b20beb3fa8bd0265bea"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; - sha1 = "50dc96413d594f995a77905905b05893cd779673"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; + sha1 = "5c02d171b4c8615b1e7163f888c1c81c30a2aaea"; }; } { @@ -170,35 +178,35 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; - sha1 = "d585cd9388ea06e6031e4cd44b6713cbead9e6cf"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz"; + sha1 = "00ec4fb6862546bd3d0aff9aac56074277173121"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; - sha1 = "0f5ccda2945277a2a7a2d3a821e15395edcf3461"; + name = "_babel_helper_simple_access___helper_simple_access_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz"; + sha1 = "8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; - sha1 = "f8a491244acf6a676158ac42072911ba83ad099f"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; }; } { @@ -210,27 +218,27 @@ }; } { - name = "_babel_helpers___helpers_7.10.1.tgz"; + name = "_babel_helpers___helpers_7.12.13.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz"; - sha1 = "a6827b7cb975c9d9cef5fd61d919f60d8844a973"; + name = "_babel_helpers___helpers_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz"; + sha1 = "3c75e993632e4dadc0274eae219c73eb7645ba47"; }; } { - name = "_babel_highlight___highlight_7.10.4.tgz"; + name = "_babel_highlight___highlight_7.12.13.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; - sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; + name = "_babel_highlight___highlight_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz"; + sha1 = "8ab538393e00370b26271b01fa08f7f27f2e795c"; }; } { - name = "_babel_parser___parser_7.11.5.tgz"; + name = "_babel_parser___parser_7.12.15.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz"; - sha1 = "c7ff6303df71080ec7a4f5b8c003c58f1cf51037"; + name = "_babel_parser___parser_7.12.15.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.15.tgz"; + sha1 = "2b20de7f0b4b332d9b119dd9c33409c538b8aacf"; }; } { @@ -722,27 +730,27 @@ }; } { - name = "_babel_template___template_7.10.4.tgz"; + name = "_babel_template___template_7.12.13.tgz"; path = fetchurl { - name = "_babel_template___template_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; - sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; + name = "_babel_template___template_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; + sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; }; } { - name = "_babel_traverse___traverse_7.11.5.tgz"; + name = "_babel_traverse___traverse_7.12.13.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz"; - sha1 = "be777b93b518eb6d76ee2e1ea1d143daa11e61c3"; + name = "_babel_traverse___traverse_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz"; + sha1 = "689f0e4b4c08587ad26622832632735fb8c4e0c0"; }; } { - name = "_babel_types___types_7.11.5.tgz"; + name = "_babel_types___types_7.12.13.tgz"; path = fetchurl { - name = "_babel_types___types_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz"; - sha1 = "d9de577d01252d77c6800cee039ee64faf75662d"; + name = "_babel_types___types_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz"; + sha1 = "8be1aa8f2c876da11a9cf650c0ecf656913ad611"; }; } { @@ -770,11 +778,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; - sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha1 = "99cc0a0584d72f1df38b900fb062ba995f395547"; }; } { @@ -786,11 +794,11 @@ }; } { - name = "_gitlab_eslint_plugin___eslint_plugin_8.0.0.tgz"; + name = "_gitlab_eslint_plugin___eslint_plugin_8.1.0.tgz"; path = fetchurl { - name = "_gitlab_eslint_plugin___eslint_plugin_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.0.0.tgz"; - sha1 = "e8d30fd98e2102f417617d0c60ef1810520a8ac6"; + name = "_gitlab_eslint_plugin___eslint_plugin_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.1.0.tgz"; + sha1 = "a98ac4219da3316d30ee717ef0603c8fa0c4d5d8"; }; } { @@ -802,11 +810,19 @@ }; } { - name = "_gitlab_svgs___svgs_1.182.0.tgz"; + name = "_gitlab_stylelint_config___stylelint_config_2.3.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.182.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.182.0.tgz"; - sha1 = "600cb577c598ff63325c3f6f049e3254abdbb580"; + name = "_gitlab_stylelint_config___stylelint_config_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/stylelint-config/-/stylelint-config-2.3.0.tgz"; + sha1 = "b27e8544ff52a4c5e23ff7a104c7efff1f7078f0"; + }; + } + { + name = "_gitlab_svgs___svgs_1.185.0.tgz"; + path = fetchurl { + name = "_gitlab_svgs___svgs_1.185.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.185.0.tgz"; + sha1 = "15b5c6d680b5fcfc2deb2a5decef427939e34ed7"; }; } { @@ -818,11 +834,11 @@ }; } { - name = "_gitlab_ui___ui_27.4.6.tgz"; + name = "_gitlab_ui___ui_28.9.1.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_27.4.6.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-27.4.6.tgz"; - sha1 = "2364c2ba981024cdce32b4657c5f0eb2ae781a4d"; + name = "_gitlab_ui___ui_28.9.1.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-28.9.1.tgz"; + sha1 = "7d4d4502ff09fca19ab815504f80afbf03dd2fc1"; }; } { @@ -937,14 +953,6 @@ sha1 = "6a0033a1d24316a1c75184d010d864f2c681bef5"; }; } - { - name = "_jest_types___types_25.5.0.tgz"; - path = fetchurl { - name = "_jest_types___types_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz"; - sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; - }; - } { name = "_jest_types___types_26.5.2.tgz"; path = fetchurl { @@ -962,19 +970,27 @@ }; } { - name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; path = fetchurl { - name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"; - sha1 = "524af240d1a360527b730475ecfa1344aa540dde"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha1 = "d4b3549a5db5de2683e0c1071ab4f140904bbf69"; }; } { - name = "_nodelib_fs.stat___fs.stat_1.1.3.tgz"; + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; path = fetchurl { - name = "_nodelib_fs.stat___fs.stat_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"; - sha1 = "2b5a3ab3f918cca48a8c754c08168e3f03eba61b"; + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha1 = "a3f2dd61bab43b8db8fa108a121cfffe4c676655"; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha1 = "cce9396b30aa5afe9e3756608f5831adcb53d063"; }; } { @@ -1009,6 +1025,54 @@ sha1 = "9a48df6511cb2b472c9f596c1f37dc0af022e751"; }; } + { + name = "_sentry_browser___browser_5.30.0.tgz"; + path = fetchurl { + name = "_sentry_browser___browser_5.30.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.30.0.tgz"; + sha1 = "c28f49d551db3172080caef9f18791a7fd39e3b3"; + }; + } + { + name = "_sentry_core___core_5.30.0.tgz"; + path = fetchurl { + name = "_sentry_core___core_5.30.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.30.0.tgz"; + sha1 = "6b203664f69e75106ee8b5a2fe1d717379b331f3"; + }; + } + { + name = "_sentry_hub___hub_5.30.0.tgz"; + path = fetchurl { + name = "_sentry_hub___hub_5.30.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.30.0.tgz"; + sha1 = "2453be9b9cb903404366e198bd30c7ca74cdc100"; + }; + } + { + name = "_sentry_minimal___minimal_5.30.0.tgz"; + path = fetchurl { + name = "_sentry_minimal___minimal_5.30.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.30.0.tgz"; + sha1 = "ce3d3a6a273428e0084adcb800bc12e72d34637b"; + }; + } + { + name = "_sentry_types___types_5.30.0.tgz"; + path = fetchurl { + name = "_sentry_types___types_5.30.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.30.0.tgz"; + sha1 = "19709bbe12a1a0115bc790b8942917da5636f402"; + }; + } + { + name = "_sentry_utils___utils_5.30.0.tgz"; + path = fetchurl { + name = "_sentry_utils___utils_5.30.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.30.0.tgz"; + sha1 = "9a5bd7ccff85ccfe7856d493bffa64cabc41e980"; + }; + } { name = "_sindresorhus_is___is_0.14.0.tgz"; path = fetchurl { @@ -1041,6 +1105,22 @@ sha1 = "3668364647b9248a0c43d738f7b046c551311338"; }; } + { + name = "_stylelint_postcss_css_in_js___postcss_css_in_js_0.37.2.tgz"; + path = fetchurl { + name = "_stylelint_postcss_css_in_js___postcss_css_in_js_0.37.2.tgz"; + url = "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz"; + sha1 = "7e5a84ad181f4234a2480803422a47b8749af3d2"; + }; + } + { + name = "_stylelint_postcss_markdown___postcss_markdown_0.36.2.tgz"; + path = fetchurl { + name = "_stylelint_postcss_markdown___postcss_markdown_0.36.2.tgz"; + url = "https://registry.yarnpkg.com/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz"; + sha1 = "0a540c4692f8dcdfc13c8e352c17e7bfee2bb391"; + }; + } { name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; path = fetchurl { @@ -1177,14 +1257,6 @@ sha1 = "e5471e7fa33c61358dd38426189c037a58433b8c"; }; } - { - name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz"; - path = fetchurl { - name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz"; - sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a"; - }; - } { name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; path = fetchurl { @@ -1193,14 +1265,6 @@ sha1 = "508b13aa344fa4976234e75dddcc34925737d821"; }; } - { - name = "_types_jest___jest_26.0.14.tgz"; - path = fetchurl { - name = "_types_jest___jest_26.0.14.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz"; - sha1 = "078695f8f65cb55c5a98450d65083b2b73e5a3f3"; - }; - } { name = "_types_json_schema___json_schema_7.0.7.tgz"; path = fetchurl { @@ -1217,6 +1281,14 @@ sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; }; } + { + name = "_types_mdast___mdast_3.0.3.tgz"; + path = fetchurl { + name = "_types_mdast___mdast_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz"; + sha1 = "2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"; + }; + } { name = "_types_minimatch___minimatch_3.0.3.tgz"; path = fetchurl { @@ -1225,6 +1297,14 @@ sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; }; } + { + name = "_types_minimist___minimist_1.2.1.tgz"; + path = fetchurl { + name = "_types_minimist___minimist_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz"; + sha1 = "283f669ff76d7b8260df8ab7a4262cc83d988256"; + }; + } { name = "_types_node___node_10.12.9.tgz"; path = fetchurl { @@ -1241,6 +1321,14 @@ sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; }; } + { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + }; + } { name = "_types_parse5___parse5_5.0.0.tgz"; path = fetchurl { @@ -1281,22 +1369,6 @@ sha1 = "9c088679876f374eb5983f150d4787aa6fb32d7e"; }; } - { - name = "_types_vfile_message___vfile_message_1.0.1.tgz"; - path = fetchurl { - name = "_types_vfile_message___vfile_message_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-1.0.1.tgz"; - sha1 = "e1e9895cc6b36c462d4244e64e6d0b6eaf65355a"; - }; - } - { - name = "_types_vfile___vfile_3.0.2.tgz"; - path = fetchurl { - name = "_types_vfile___vfile_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/vfile/-/vfile-3.0.2.tgz"; - sha1 = "19c18cd232df11ce6fa6ad80259bc86c366b09b9"; - }; - } { name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; path = fetchurl { @@ -1825,6 +1897,14 @@ sha1 = "756749dafc732792c8ca0923f9a40564b7c59ecc"; }; } + { + name = "apollo_link_http___apollo_link_http_1.5.17.tgz"; + path = fetchurl { + name = "apollo_link_http___apollo_link_http_1.5.17.tgz"; + url = "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.17.tgz"; + sha1 = "499e9f1711bf694497f02c51af12d82de5d8d8ba"; + }; + } { name = "apollo_link___apollo_link_1.2.14.tgz"; path = fetchurl { @@ -1961,6 +2041,14 @@ sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; }; } + { + name = "array_union___array_union_2.1.0.tgz"; + path = fetchurl { + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + }; + } { name = "array_uniq___array_uniq_1.0.3.tgz"; path = fetchurl { @@ -2041,14 +2129,6 @@ sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; } - { - name = "astral_regex___astral_regex_1.0.0.tgz"; - path = fetchurl { - name = "astral_regex___astral_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; - sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; - }; - } { name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { @@ -2098,11 +2178,11 @@ }; } { - name = "autoprefixer___autoprefixer_9.6.1.tgz"; + name = "autoprefixer___autoprefixer_9.8.6.tgz"; path = fetchurl { - name = "autoprefixer___autoprefixer_9.6.1.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz"; - sha1 = "51967a02d2d2300bb01866c1611ec8348d355a47"; + name = "autoprefixer___autoprefixer_9.8.6.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz"; + sha1 = "3b73594ca1bf9266320c5acf1588d74dea74210f"; }; } { @@ -2242,11 +2322,11 @@ }; } { - name = "bail___bail_1.0.3.tgz"; + name = "bail___bail_1.0.5.tgz"; path = fetchurl { - name = "bail___bail_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/bail/-/bail-1.0.3.tgz"; - sha1 = "63cfb9ddbac829b02a3128cd53224be78e6c21a3"; + name = "bail___bail_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz"; + sha1 = "b6fa133404a392cbc1f8c4bf63f5953351e7a776"; }; } { @@ -2513,14 +2593,6 @@ sha1 = "bf757a2da376b3447b800a16f0f1c96358138766"; }; } - { - name = "bs_logger___bs_logger_0.2.6.tgz"; - path = fetchurl { - name = "bs_logger___bs_logger_0.2.6.tgz"; - url = "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz"; - sha1 = "eb7d365307a72cf974cc6cda76b68354ad336bd8"; - }; - } { name = "bser___bser_2.1.1.tgz"; path = fetchurl { @@ -2649,22 +2721,6 @@ sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; } - { - name = "caller_callsite___caller_callsite_2.0.0.tgz"; - path = fetchurl { - name = "caller_callsite___caller_callsite_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz"; - sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; - }; - } - { - name = "caller_path___caller_path_2.0.0.tgz"; - path = fetchurl { - name = "caller_path___caller_path_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz"; - sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; - }; - } { name = "callsite___callsite_1.0.0.tgz"; path = fetchurl { @@ -2673,14 +2729,6 @@ sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; }; } - { - name = "callsites___callsites_2.0.0.tgz"; - path = fetchurl { - name = "callsites___callsites_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; - sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; - }; - } { name = "callsites___callsites_3.0.0.tgz"; path = fetchurl { @@ -2706,11 +2754,11 @@ }; } { - name = "camelcase_keys___camelcase_keys_4.2.0.tgz"; + name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; path = fetchurl { - name = "camelcase_keys___camelcase_keys_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz"; - sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; + name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; + url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; + sha1 = "5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"; }; } { @@ -2721,14 +2769,6 @@ sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; }; } - { - name = "camelcase___camelcase_4.1.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - } { name = "camelcase___camelcase_5.3.1.tgz"; path = fetchurl { @@ -2746,11 +2786,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001178.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001185.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001178.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001178.tgz"; - sha1 = "3ad813b2b2c7d585b0be0a2440e1e233c6eabdbc"; + name = "caniuse_lite___caniuse_lite_1.0.30001185.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz"; + sha1 = "3482a407d261da04393e2f0d61eefbc53be43b95"; }; } { @@ -2777,14 +2817,6 @@ sha1 = "98cc890ca652dd2ef0e70b37925310ff9e90fc8b"; }; } - { - name = "ccount___ccount_1.0.3.tgz"; - path = fetchurl { - name = "ccount___ccount_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/ccount/-/ccount-1.0.3.tgz"; - sha1 = "f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"; - }; - } { name = "chalk___chalk_1.1.3.tgz"; path = fetchurl { @@ -2826,35 +2858,27 @@ }; } { - name = "character_entities_html4___character_entities_html4_1.1.2.tgz"; + name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; path = fetchurl { - name = "character_entities_html4___character_entities_html4_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.2.tgz"; - sha1 = "c44fdde3ce66b52e8d321d6c1bf46101f0150610"; + name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz"; + sha1 = "94bc1845dce70a5bb9d2ecc748725661293d8fc1"; }; } { - name = "character_entities_legacy___character_entities_legacy_1.1.2.tgz"; + name = "character_entities___character_entities_1.2.4.tgz"; path = fetchurl { - name = "character_entities_legacy___character_entities_legacy_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz"; - sha1 = "7c6defb81648498222c9855309953d05f4d63a9c"; + name = "character_entities___character_entities_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz"; + sha1 = "e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"; }; } { - name = "character_entities___character_entities_1.2.2.tgz"; + name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; path = fetchurl { - name = "character_entities___character_entities_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.2.tgz"; - sha1 = "58c8f371c0774ef0ba9b2aca5f00d8f100e6e363"; - }; - } - { - name = "character_reference_invalid___character_reference_invalid_1.1.2.tgz"; - path = fetchurl { - name = "character_reference_invalid___character_reference_invalid_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz"; - sha1 = "21e421ad3d84055952dab4a43a04e73cd425d3ed"; + name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz"; + sha1 = "083329cda0eae272ab3dbbf37e9a382c13af1560"; }; } { @@ -3057,14 +3081,6 @@ sha1 = "b88423a4a7c785175c784c84e87f5950820280e1"; }; } - { - name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; - path = fetchurl { - name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz"; - sha1 = "c2495b699ab1ed380d29a1091e01063e75dbbe3a"; - }; - } { name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; path = fetchurl { @@ -3434,11 +3450,11 @@ }; } { - name = "core_js___core_js_3.8.3.tgz"; + name = "core_js___core_js_3.9.1.tgz"; path = fetchurl { - name = "core_js___core_js_3.8.3.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz"; - sha1 = "c21906e1f14f3689f93abcc6e26883550dd92dd0"; + name = "core_js___core_js_3.9.1.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz"; + sha1 = "cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"; }; } { @@ -3458,11 +3474,11 @@ }; } { - name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; path = fetchurl { - name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; - sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; + sha1 = "ef9b44d773959cae63ddecd122de23853b60f8d3"; }; } { @@ -3561,6 +3577,14 @@ sha1 = "42005d83204b2b4a5d93b6b1a5644133b5927a02"; }; } + { + name = "css_color_names___css_color_names_0.0.4.tgz"; + path = fetchurl { + name = "css_color_names___css_color_names_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz"; + sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; + }; + } { name = "css_loader___css_loader_2.1.1.tgz"; path = fetchurl { @@ -3577,6 +3601,22 @@ sha1 = "5f1ad43e2d8eefbfdc304fcd39a521664943e3eb"; }; } + { + name = "css_shorthand_properties___css_shorthand_properties_1.1.1.tgz"; + path = fetchurl { + name = "css_shorthand_properties___css_shorthand_properties_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz"; + sha1 = "1c808e63553c283f289f2dd56fcee8f3337bd935"; + }; + } + { + name = "css_values___css_values_0.1.0.tgz"; + path = fetchurl { + name = "css_values___css_values_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-values/-/css-values-0.1.0.tgz"; + sha1 = "128b7ce103d4dc027a814a5d5995c54781d7b4c6"; + }; + } { name = "css___css_2.2.4.tgz"; path = fetchurl { @@ -4010,11 +4050,11 @@ }; } { - name = "debug___debug_4.1.1.tgz"; + name = "debug___debug_4.3.1.tgz"; path = fetchurl { - name = "debug___debug_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; }; } { @@ -4257,14 +4297,6 @@ sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; }; } - { - name = "diff_sequences___diff_sequences_25.2.6.tgz"; - path = fetchurl { - name = "diff_sequences___diff_sequences_25.2.6.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz"; - sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; - }; - } { name = "diff_sequences___diff_sequences_26.5.0.tgz"; path = fetchurl { @@ -4297,6 +4329,14 @@ sha1 = "fa09f0694153c8918b18ba0deafae94769fc50c4"; }; } + { + name = "dir_glob___dir_glob_3.0.1.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + }; + } { name = "dns_equal___dns_equal_1.0.0.tgz"; path = fetchurl { @@ -4402,19 +4442,19 @@ }; } { - name = "domelementtype___domelementtype_1.3.0.tgz"; + name = "domelementtype___domelementtype_1.3.1.tgz"; path = fetchurl { - name = "domelementtype___domelementtype_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + name = "domelementtype___domelementtype_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz"; + sha1 = "d048c44b37b0d10a7f2a3d5fee3f4333d790481f"; }; } { - name = "domelementtype___domelementtype_2.0.1.tgz"; + name = "domelementtype___domelementtype_2.1.0.tgz"; path = fetchurl { - name = "domelementtype___domelementtype_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz"; - sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"; + name = "domelementtype___domelementtype_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz"; + sha1 = "a851c080a6d1c3d94344aed151d99f669edf585e"; }; } { @@ -4426,35 +4466,27 @@ }; } { - name = "domhandler___domhandler_2.4.1.tgz"; + name = "domhandler___domhandler_2.4.2.tgz"; path = fetchurl { - name = "domhandler___domhandler_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz"; - sha1 = "892e47000a99be55bbf3774ffea0561d8879c259"; + name = "domhandler___domhandler_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz"; + sha1 = "8805097e933d65e85546f726d60f5eb88b44f803"; }; } { - name = "dompurify___dompurify_2.2.6.tgz"; + name = "dompurify___dompurify_2.2.7.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.2.6.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.6.tgz"; - sha1 = "54945dc5c0b45ce5ae228705777e8e59d7b2edc4"; + name = "dompurify___dompurify_2.2.7.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.7.tgz"; + sha1 = "a5f055a2a471638680e779bd08fc334962d11fd8"; }; } { - name = "domutils___domutils_1.6.2.tgz"; + name = "domutils___domutils_1.7.0.tgz"; path = fetchurl { - name = "domutils___domutils_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz"; - sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; - }; - } - { - name = "dot_prop___dot_prop_4.2.1.tgz"; - path = fetchurl { - name = "dot_prop___dot_prop_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz"; - sha1 = "45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"; + name = "domutils___domutils_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz"; + sha1 = "56ea341e834e06e6748af7a1cb25da67ea9f8c2a"; }; } { @@ -4617,6 +4649,14 @@ sha1 = "ed29634d19baba463b6ce6b80a37213eab71ec43"; }; } + { + name = "ends_with___ends_with_0.2.0.tgz"; + path = fetchurl { + name = "ends_with___ends_with_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/ends-with/-/ends-with-0.2.0.tgz"; + sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a"; + }; + } { name = "engine.io_client___engine.io_client_3.2.1.tgz"; path = fetchurl { @@ -4674,11 +4714,11 @@ }; } { - name = "entities___entities_1.1.1.tgz"; + name = "entities___entities_1.1.2.tgz"; path = fetchurl { - name = "entities___entities_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + name = "entities___entities_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz"; + sha1 = "bdfa735299664dfafd34529ed4f8522a275fea56"; }; } { @@ -4962,11 +5002,11 @@ }; } { - name = "eslint___eslint_7.19.0.tgz"; + name = "eslint___eslint_7.21.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz"; - sha1 = "6719621b196b5fad72e43387981314e5d0dc3f41"; + name = "eslint___eslint_7.21.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz"; + sha1 = "4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"; }; } { @@ -4994,11 +5034,11 @@ }; } { - name = "esquery___esquery_1.3.1.tgz"; + name = "esquery___esquery_1.4.0.tgz"; path = fetchurl { - name = "esquery___esquery_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; - sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; }; } { @@ -5242,11 +5282,11 @@ }; } { - name = "fast_glob___fast_glob_2.2.6.tgz"; + name = "fast_glob___fast_glob_3.2.5.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_2.2.6.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz"; - sha1 = "a5d5b697ec8deda468d85a74035290a025a95295"; + name = "fast_glob___fast_glob_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz"; + sha1 = "7939af2a656de79a4f1901903ee8adcaa7cb9661"; }; } { @@ -5274,11 +5314,27 @@ }; } { - name = "fault___fault_1.0.2.tgz"; + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; path = fetchurl { - name = "fault___fault_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/fault/-/fault-1.0.2.tgz"; - sha1 = "c3d0fec202f172a3a4d414042ad2bb5e2a3ffbaa"; + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; + sha1 = "9990f7d3a88cc5a9ffd1f1745745251700d497e2"; + }; + } + { + name = "fastq___fastq_1.10.1.tgz"; + path = fetchurl { + name = "fastq___fastq_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.10.1.tgz"; + sha1 = "8b8f2ac8bf3632d67afcd65dac248d5fdc45385e"; + }; + } + { + name = "fault___fault_1.0.4.tgz"; + path = fetchurl { + name = "fault___fault_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz"; + sha1 = "eafcfc0a6d214fc94601e170df29954a4f842f13"; }; } { @@ -5306,19 +5362,11 @@ }; } { - name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { - name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; - sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; - }; - } - { - name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; - path = fetchurl { - name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; - sha1 = "7921a89c391c6d93efec2169ac6bf300c527ea0a"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; }; } { @@ -5441,14 +5489,6 @@ sha1 = "17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"; }; } - { - name = "flat_cache___flat_cache_2.0.1.tgz"; - path = fetchurl { - name = "flat_cache___flat_cache_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; - sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; - }; - } { name = "flat_cache___flat_cache_3.0.4.tgz"; path = fetchurl { @@ -5690,11 +5730,11 @@ }; } { - name = "get_stdin___get_stdin_7.0.0.tgz"; + name = "get_stdin___get_stdin_8.0.0.tgz"; path = fetchurl { - name = "get_stdin___get_stdin_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz"; - sha1 = "8d5de98f15171a125c5e516643c7a6d0ea8a96f6"; + name = "get_stdin___get_stdin_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz"; + sha1 = "cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"; }; } { @@ -5769,14 +5809,6 @@ sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; }; } - { - name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz"; - path = fetchurl { - name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"; - sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; - }; - } { name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; path = fetchurl { @@ -5857,6 +5889,14 @@ sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; }; } + { + name = "globby___globby_11.0.2.tgz"; + path = fetchurl { + name = "globby___globby_11.0.2.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz"; + sha1 = "1af538b766a3b540ebfb58a32b2e2d5897321d83"; + }; + } { name = "globby___globby_6.1.0.tgz"; path = fetchurl { @@ -5873,14 +5913,6 @@ sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; }; } - { - name = "globby___globby_9.2.0.tgz"; - path = fetchurl { - name = "globby___globby_9.2.0.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz"; - sha1 = "fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"; - }; - } { name = "globjoin___globjoin_0.1.4.tgz"; path = fetchurl { @@ -5898,11 +5930,11 @@ }; } { - name = "gonzales_pe___gonzales_pe_4.2.3.tgz"; + name = "gonzales_pe___gonzales_pe_4.3.0.tgz"; path = fetchurl { - name = "gonzales_pe___gonzales_pe_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.3.tgz"; - sha1 = "41091703625433285e0aee3aa47829fc1fbeb6f2"; + name = "gonzales_pe___gonzales_pe_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz"; + sha1 = "fe9dec5f3c557eead09ff868c65826be54d067b3"; }; } { @@ -6009,6 +6041,14 @@ sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; }; } + { + name = "hard_rejection___hard_rejection_2.1.0.tgz"; + path = fetchurl { + name = "hard_rejection___hard_rejection_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz"; + sha1 = "1c6eda5c1685c63942766d79bb40ae773cecd883"; + }; + } { name = "has_ansi___has_ansi_2.0.0.tgz"; path = fetchurl { @@ -6154,11 +6194,11 @@ }; } { - name = "highlight.js___highlight.js_9.13.1.tgz"; + name = "highlight.js___highlight.js_10.6.0.tgz"; path = fetchurl { - name = "highlight.js___highlight.js_9.13.1.tgz"; - url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz"; - sha1 = "054586d53a6863311168488a0f58d6c505ce641e"; + name = "highlight.js___highlight.js_10.6.0.tgz"; + url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.6.0.tgz"; + sha1 = "0073aa71d566906965ba6e1b7be7b2682f5e18b6"; }; } { @@ -6193,6 +6233,14 @@ sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; }; } + { + name = "hosted_git_info___hosted_git_info_3.0.8.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz"; + sha1 = "6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d"; + }; + } { name = "hpack.js___hpack.js_2.1.6.tgz"; path = fetchurl { @@ -6234,19 +6282,19 @@ }; } { - name = "html_tags___html_tags_3.0.0.tgz"; + name = "html_tags___html_tags_3.1.0.tgz"; path = fetchurl { - name = "html_tags___html_tags_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/html-tags/-/html-tags-3.0.0.tgz"; - sha1 = "41f57708c9e6b7b46a00a22317d614c4a2bab166"; + name = "html_tags___html_tags_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz"; + sha1 = "7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"; }; } { - name = "htmlparser2___htmlparser2_3.10.0.tgz"; + name = "htmlparser2___htmlparser2_3.10.1.tgz"; path = fetchurl { - name = "htmlparser2___htmlparser2_3.10.0.tgz"; - url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz"; - sha1 = "5f5e422dcf6119c0d983ed36260ce9ded0bee464"; + name = "htmlparser2___htmlparser2_3.10.1.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz"; + sha1 = "bd679dc3f59897b6a34bb10749c855bb53a9392f"; }; } { @@ -6433,14 +6481,6 @@ sha1 = "9dfe713d49bf871cc59aedfce59b1992fa37a977"; }; } - { - name = "import_fresh___import_fresh_2.0.0.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz"; - sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; - }; - } { name = "import_fresh___import_fresh_3.3.0.tgz"; path = fetchurl { @@ -6505,14 +6545,6 @@ sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; }; } - { - name = "indent_string___indent_string_3.2.0.tgz"; - path = fetchurl { - name = "indent_string___indent_string_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz"; - sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; - }; - } { name = "indent_string___indent_string_4.0.0.tgz"; path = fetchurl { @@ -6674,27 +6706,19 @@ }; } { - name = "is_alphabetical___is_alphabetical_1.0.2.tgz"; + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; path = fetchurl { - name = "is_alphabetical___is_alphabetical_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.2.tgz"; - sha1 = "1fa6e49213cb7885b75d15862fb3f3d96c884f41"; + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz"; + sha1 = "9e7d6b94916be22153745d184c298cbf986a686d"; }; } { - name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz"; + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; path = fetchurl { - name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz"; - sha1 = "4a9cef71daf4c001c1d81d63d140cf53fd6889f4"; - }; - } - { - name = "is_alphanumerical___is_alphanumerical_1.0.2.tgz"; - path = fetchurl { - name = "is_alphanumerical___is_alphanumerical_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz"; - sha1 = "1138e9ae5040158dc6ff76b820acd6b7a181fd40"; + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"; + sha1 = "7eb9a2431f855f6b1ef1a78e326df515696c4dbf"; }; } { @@ -6722,11 +6746,11 @@ }; } { - name = "is_buffer___is_buffer_2.0.3.tgz"; + name = "is_buffer___is_buffer_2.0.5.tgz"; path = fetchurl { - name = "is_buffer___is_buffer_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz"; - sha1 = "4ecf3fcf749cbd1e472689e109ac66261a25e725"; + name = "is_buffer___is_buffer_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz"; + sha1 = "ebc252e400d22ff8d77fa09888821a24a658c191"; }; } { @@ -6770,11 +6794,11 @@ }; } { - name = "is_decimal___is_decimal_1.0.2.tgz"; + name = "is_decimal___is_decimal_1.0.4.tgz"; path = fetchurl { - name = "is_decimal___is_decimal_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.2.tgz"; - sha1 = "894662d6a8709d307f3a276ca4339c8fa5dff0ff"; + name = "is_decimal___is_decimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz"; + sha1 = "65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"; }; } { @@ -6793,14 +6817,6 @@ sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; }; } - { - name = "is_directory___is_directory_0.3.1.tgz"; - path = fetchurl { - name = "is_directory___is_directory_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz"; - sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; - }; - } { name = "is_docker___is_docker_2.1.1.tgz"; path = fetchurl { @@ -6890,11 +6906,11 @@ }; } { - name = "is_hexadecimal___is_hexadecimal_1.0.2.tgz"; + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; path = fetchurl { - name = "is_hexadecimal___is_hexadecimal_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz"; - sha1 = "b6e710d7d07bb66b98cb8cece5c9b4921deeb835"; + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"; + sha1 = "cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"; }; } { @@ -6937,14 +6953,6 @@ sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; }; } - { - name = "is_obj___is_obj_1.0.1.tgz"; - path = fetchurl { - name = "is_obj___is_obj_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; - }; - } { name = "is_obj___is_obj_2.0.0.tgz"; path = fetchurl { @@ -6993,6 +7001,14 @@ sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; }; } + { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha1 = "45e42e37fccf1f40da8e5f76ee21515840c09287"; + }; + } { name = "is_plain_object___is_plain_object_2.0.4.tgz"; path = fetchurl { @@ -7073,14 +7089,6 @@ sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; } - { - name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz"; - path = fetchurl { - name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz"; - sha1 = "ede53b4c6f6fb3874533751ec9280d01928d03ed"; - }; - } { name = "is_whitespace___is_whitespace_0.3.0.tgz"; path = fetchurl { @@ -7097,14 +7105,6 @@ sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; }; } - { - name = "is_word_character___is_word_character_1.0.2.tgz"; - path = fetchurl { - name = "is_word_character___is_word_character_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.2.tgz"; - sha1 = "46a5dac3f2a1840898b91e576cd40d493f3ae553"; - }; - } { name = "is_wsl___is_wsl_1.1.0.tgz"; path = fetchurl { @@ -7353,14 +7353,6 @@ sha1 = "6e828e25f10124433dd008fbd83348636de0972a"; }; } - { - name = "jest_diff___jest_diff_25.5.0.tgz"; - path = fetchurl { - name = "jest_diff___jest_diff_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz"; - sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9"; - }; - } { name = "jest_diff___jest_diff_26.5.2.tgz"; path = fetchurl { @@ -7401,14 +7393,6 @@ sha1 = "275a0f01b5e47447056f1541a15ed4da14acca03"; }; } - { - name = "jest_get_type___jest_get_type_25.2.6.tgz"; - path = fetchurl { - name = "jest_get_type___jest_get_type_25.2.6.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz"; - sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877"; - }; - } { name = "jest_get_type___jest_get_type_26.3.0.tgz"; path = fetchurl { @@ -7793,14 +7777,6 @@ sha1 = "7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"; }; } - { - name = "json5___json5_2.1.3.tgz"; - path = fetchurl { - name = "json5___json5_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; - sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; - }; - } { name = "json5___json5_1.0.1.tgz"; path = fetchurl { @@ -7809,6 +7785,14 @@ sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; }; } + { + name = "json5___json5_2.1.3.tgz"; + path = fetchurl { + name = "json5___json5_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; + sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; + }; + } { name = "jsonc_parser___jsonc_parser_2.3.1.tgz"; path = fetchurl { @@ -8002,11 +7986,11 @@ }; } { - name = "known_css_properties___known_css_properties_0.14.0.tgz"; + name = "known_css_properties___known_css_properties_0.20.0.tgz"; path = fetchurl { - name = "known_css_properties___known_css_properties_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.14.0.tgz"; - sha1 = "d7032b4334a32dc22e6e46b081ec789daf18756c"; + name = "known_css_properties___known_css_properties_0.20.0.tgz"; + url = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.20.0.tgz"; + sha1 = "0570831661b47dd835293218381166090ff60e96"; }; } { @@ -8105,14 +8089,6 @@ sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; }; } - { - name = "load_json_file___load_json_file_4.0.0.tgz"; - path = fetchurl { - name = "load_json_file___load_json_file_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz"; - sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; - }; - } { name = "loader_runner___loader_runner_2.4.0.tgz"; path = fetchurl { @@ -8321,14 +8297,6 @@ sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; }; } - { - name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; - path = fetchurl { - name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; - sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; - }; - } { name = "lodash.pick___lodash.pick_4.4.0.tgz"; path = fetchurl { @@ -8402,11 +8370,11 @@ }; } { - name = "log_symbols___log_symbols_3.0.0.tgz"; + name = "log_symbols___log_symbols_4.0.0.tgz"; path = fetchurl { - name = "log_symbols___log_symbols_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz"; - sha1 = "f3a08516a5dea893336a7dee14d18a1cfdab77c4"; + name = "log_symbols___log_symbols_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz"; + sha1 = "69b3cc46d20f448eccdb75ea1fa733d9e821c920"; }; } { @@ -8426,11 +8394,11 @@ }; } { - name = "longest_streak___longest_streak_2.0.2.tgz"; + name = "longest_streak___longest_streak_2.0.4.tgz"; path = fetchurl { - name = "longest_streak___longest_streak_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz"; - sha1 = "2421b6ba939a443bb9ffebf596585a50b4c38e2e"; + name = "longest_streak___longest_streak_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz"; + sha1 = "b8599957da5b5dab64dee3fe316fa774597d90e4"; }; } { @@ -8474,11 +8442,11 @@ }; } { - name = "lowlight___lowlight_1.11.0.tgz"; + name = "lowlight___lowlight_1.19.0.tgz"; path = fetchurl { - name = "lowlight___lowlight_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/lowlight/-/lowlight-1.11.0.tgz"; - sha1 = "1304d83005126d4e8b1dc0f07981e9b689ec2efc"; + name = "lowlight___lowlight_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/lowlight/-/lowlight-1.19.0.tgz"; + sha1 = "b8544199cafcf10c5731b21c7458c358f79a2a97"; }; } { @@ -8529,14 +8497,6 @@ sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; }; } - { - name = "make_error___make_error_1.3.6.tgz"; - path = fetchurl { - name = "make_error___make_error_1.3.6.tgz"; - url = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz"; - sha1 = "2eb2e37ea9b67c4891f684a1394799af484cf7a2"; - }; - } { name = "makeerror___makeerror_1.0.11.tgz"; path = fetchurl { @@ -8562,11 +8522,11 @@ }; } { - name = "map_obj___map_obj_2.0.0.tgz"; + name = "map_obj___map_obj_4.1.0.tgz"; path = fetchurl { - name = "map_obj___map_obj_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz"; - sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; + name = "map_obj___map_obj_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/map-obj/-/map-obj-4.1.0.tgz"; + sha1 = "b91221b542734b9f14256c0132c897c5d7256fd5"; }; } { @@ -8577,14 +8537,6 @@ sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; } - { - name = "markdown_escapes___markdown_escapes_1.0.2.tgz"; - path = fetchurl { - name = "markdown_escapes___markdown_escapes_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.2.tgz"; - sha1 = "e639cbde7b99c841c0bacc8a07982873b46d2122"; - }; - } { name = "markdown_it___markdown_it_11.0.0.tgz"; path = fetchurl { @@ -8594,19 +8546,11 @@ }; } { - name = "markdown_it___markdown_it_8.4.2.tgz"; + name = "markdown_it___markdown_it_10.0.0.tgz"; path = fetchurl { - name = "markdown_it___markdown_it_8.4.2.tgz"; - url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz"; - sha1 = "386f98998dc15a37722aa7722084f4020bdd9b54"; - }; - } - { - name = "markdown_table___markdown_table_1.1.2.tgz"; - path = fetchurl { - name = "markdown_table___markdown_table_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz"; - sha1 = "c78db948fa879903a41bce522e3b96f801c63786"; + name = "markdown_it___markdown_it_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz"; + sha1 = "abfc64f141b1722d663402044e43927f1f50a8dc"; }; } { @@ -8650,11 +8594,11 @@ }; } { - name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz"; + name = "mathml_tag_names___mathml_tag_names_2.1.3.tgz"; path = fetchurl { - name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz"; - sha1 = "6dff66c99d55ecf739ca53c492e626f1d12a33cc"; + name = "mathml_tag_names___mathml_tag_names_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz"; + sha1 = "4ddadd67308e780cf16a47685878ee27b736a0a3"; }; } { @@ -8674,11 +8618,27 @@ }; } { - name = "mdast_util_compact___mdast_util_compact_1.0.2.tgz"; + name = "mdast_util_from_markdown___mdast_util_from_markdown_0.8.5.tgz"; path = fetchurl { - name = "mdast_util_compact___mdast_util_compact_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.2.tgz"; - sha1 = "c12ebe16fffc84573d3e19767726de226e95f649"; + name = "mdast_util_from_markdown___mdast_util_from_markdown_0.8.5.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz"; + sha1 = "d1ef2ca42bc377ecb0463a987910dae89bd9a28c"; + }; + } + { + name = "mdast_util_to_markdown___mdast_util_to_markdown_0.6.5.tgz"; + path = fetchurl { + name = "mdast_util_to_markdown___mdast_util_to_markdown_0.6.5.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz"; + sha1 = "b33f67ca820d69e6cc527a93d4039249b504bebe"; + }; + } + { + name = "mdast_util_to_string___mdast_util_to_string_2.0.0.tgz"; + path = fetchurl { + name = "mdast_util_to_string___mdast_util_to_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz"; + sha1 = "b8cfe6a713e1091cb5b728fc48885a4767f8b97b"; }; } { @@ -8730,11 +8690,11 @@ }; } { - name = "meow___meow_5.0.0.tgz"; + name = "meow___meow_9.0.0.tgz"; path = fetchurl { - name = "meow___meow_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz"; - sha1 = "dfc73d63a9afc714a5e371760eb5c88b91078aa4"; + name = "meow___meow_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz"; + sha1 = "cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"; }; } { @@ -8762,11 +8722,11 @@ }; } { - name = "merge2___merge2_1.2.3.tgz"; + name = "merge2___merge2_1.4.1.tgz"; path = fetchurl { - name = "merge2___merge2_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz"; - sha1 = "7ee99dbd69bb6481689253f018488a1b902b0ed5"; + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; }; } { @@ -8785,6 +8745,14 @@ sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; } + { + name = "micromark___micromark_2.11.4.tgz"; + path = fetchurl { + name = "micromark___micromark_2.11.4.tgz"; + url = "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz"; + sha1 = "d13436138eea826383e822449c9a5c50ee44665a"; + }; + } { name = "micromatch___micromatch_3.1.10.tgz"; path = fetchurl { @@ -8865,6 +8833,14 @@ sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; }; } + { + name = "min_indent___min_indent_1.0.1.tgz"; + path = fetchurl { + name = "min_indent___min_indent_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz"; + sha1 = "a63f681673b30571fbe8bc25686ae746eefa9869"; + }; + } { name = "minify___minify_4.1.2.tgz"; path = fetchurl { @@ -8898,19 +8874,11 @@ }; } { - name = "minimist_options___minimist_options_3.0.2.tgz"; + name = "minimist_options___minimist_options_4.1.0.tgz"; path = fetchurl { - name = "minimist_options___minimist_options_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz"; - sha1 = "fba4c8191339e13ecf4d61beb03f070103f3d954"; - }; - } - { - name = "minimist___minimist_1.1.3.tgz"; - path = fetchurl { - name = "minimist___minimist_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz"; - sha1 = "3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"; + name = "minimist_options___minimist_options_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz"; + sha1 = "c0655713c53a8a2ebd77ffa247d342c40f010619"; }; } { @@ -8993,14 +8961,6 @@ sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; }; } - { - name = "mkdirp___mkdirp_1.0.4.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; - sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; - }; - } { name = "mkdirp___mkdirp_0.5.5.tgz"; path = fetchurl { @@ -9009,6 +8969,14 @@ sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; }; } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; + }; + } { name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz"; path = fetchurl { @@ -9081,6 +9049,14 @@ sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; }; } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } { name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; path = fetchurl { @@ -9273,6 +9249,14 @@ sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; }; } + { + name = "normalize_package_data___normalize_package_data_3.0.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz"; + sha1 = "1f8a7c423b3d2e85eb36985eaf81de381d01301a"; + }; + } { name = "normalize_path___normalize_path_2.1.1.tgz"; path = fetchurl { @@ -9538,11 +9522,11 @@ }; } { - name = "orderedmap___orderedmap_1.0.0.tgz"; + name = "orderedmap___orderedmap_1.1.1.tgz"; path = fetchurl { - name = "orderedmap___orderedmap_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.0.0.tgz"; - sha1 = "d90fc2ba1ed085190907d601dec6e6a53f8d41ba"; + name = "orderedmap___orderedmap_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.1.tgz"; + sha1 = "c618e77611b3b21d0fe3edc92586265e0059c789"; }; } { @@ -9746,11 +9730,11 @@ }; } { - name = "parse_entities___parse_entities_1.2.0.tgz"; + name = "parse_entities___parse_entities_2.0.0.tgz"; path = fetchurl { - name = "parse_entities___parse_entities_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.0.tgz"; - sha1 = "9deac087661b2e36814153cb78d7e54a4c5fd6f4"; + name = "parse_entities___parse_entities_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz"; + sha1 = "53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"; }; } { @@ -9761,14 +9745,6 @@ sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; }; } - { - name = "parse_json___parse_json_4.0.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; - }; - } { name = "parse_json___parse_json_5.1.0.tgz"; path = fetchurl { @@ -9937,6 +9913,14 @@ sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"; }; } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } { name = "pbkdf2___pbkdf2_3.0.14.tgz"; path = fetchurl { @@ -10097,14 +10081,6 @@ sha1 = "b40913f94eaacc2453fd30a1327ad6ee1f88b204"; }; } - { - name = "postcss_jsx___postcss_jsx_0.36.2.tgz"; - path = fetchurl { - name = "postcss_jsx___postcss_jsx_0.36.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.2.tgz"; - sha1 = "34bcd6752426a60b8df73f069e7595383060a794"; - }; - } { name = "postcss_less___postcss_less_3.1.4.tgz"; path = fetchurl { @@ -10113,14 +10089,6 @@ sha1 = "369f58642b5928ef898ffbc1a6e93c958304c5ad"; }; } - { - name = "postcss_markdown___postcss_markdown_0.36.0.tgz"; - path = fetchurl { - name = "postcss_markdown___postcss_markdown_0.36.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-markdown/-/postcss-markdown-0.36.0.tgz"; - sha1 = "7f22849ae0e3db18820b7b0d5e7833f13a447560"; - }; - } { name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz"; path = fetchurl { @@ -10161,14 +10129,6 @@ sha1 = "479b46dc0c5ca3dc7fa5270851836b9ec7152f64"; }; } - { - name = "postcss_reporter___postcss_reporter_6.0.1.tgz"; - path = fetchurl { - name = "postcss_reporter___postcss_reporter_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-6.0.1.tgz"; - sha1 = "7c055120060a97c8837b4e48215661aafb74245f"; - }; - } { name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz"; path = fetchurl { @@ -10178,43 +10138,35 @@ }; } { - name = "postcss_safe_parser___postcss_safe_parser_4.0.1.tgz"; + name = "postcss_safe_parser___postcss_safe_parser_4.0.2.tgz"; path = fetchurl { - name = "postcss_safe_parser___postcss_safe_parser_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz"; - sha1 = "8756d9e4c36fdce2c72b091bbc8ca176ab1fcdea"; + name = "postcss_safe_parser___postcss_safe_parser_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz"; + sha1 = "a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96"; }; } { - name = "postcss_sass___postcss_sass_0.3.5.tgz"; + name = "postcss_sass___postcss_sass_0.4.4.tgz"; path = fetchurl { - name = "postcss_sass___postcss_sass_0.3.5.tgz"; - url = "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.3.5.tgz"; - sha1 = "6d3e39f101a53d2efa091f953493116d32beb68c"; + name = "postcss_sass___postcss_sass_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.4.tgz"; + sha1 = "91f0f3447b45ce373227a98b61f8d8f0785285a3"; }; } { - name = "postcss_scss___postcss_scss_2.0.0.tgz"; + name = "postcss_scss___postcss_scss_2.1.1.tgz"; path = fetchurl { - name = "postcss_scss___postcss_scss_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz"; - sha1 = "248b0a28af77ea7b32b1011aba0f738bda27dea1"; + name = "postcss_scss___postcss_scss_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.1.1.tgz"; + sha1 = "ec3a75fa29a55e016b90bf3269026c53c1d2b383"; }; } { - name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz"; - sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865"; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha1 = "934cf799d016c83411859e09dcecade01286ec5c"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; + sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3"; }; } { @@ -10234,19 +10186,19 @@ }; } { - name = "postcss_value_parser___postcss_value_parser_4.0.0.tgz"; + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz"; - sha1 = "99a983d365f7b2ad8d0f9b8c3094926eab4b936d"; + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; }; } { - name = "postcss___postcss_7.0.30.tgz"; + name = "postcss___postcss_7.0.35.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.30.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz"; - sha1 = "cc9378beffe46a02cbc4506a0477d05fcea9a8e2"; + name = "postcss___postcss_7.0.35.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz"; + sha1 = "d2be00b998f7f211d8a276974079f2e92b970e24"; }; } { @@ -10305,14 +10257,6 @@ sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; }; } - { - name = "pretty_format___pretty_format_25.5.0.tgz"; - path = fetchurl { - name = "pretty_format___pretty_format_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz"; - sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; - }; - } { name = "pretty_format___pretty_format_26.5.2.tgz"; path = fetchurl { @@ -10394,115 +10338,115 @@ }; } { - name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz"; + name = "prosemirror_collab___prosemirror_collab_1.2.2.tgz"; path = fetchurl { - name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.0.7.tgz"; - sha1 = "e5a2ba821e29ea7065c88277fe2c3d7f6b0b9d37"; + name = "prosemirror_collab___prosemirror_collab_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.2.2.tgz"; + sha1 = "8d2c0e82779cfef5d051154bd0836428bd6d9c4a"; }; } { - name = "prosemirror_dropcursor___prosemirror_dropcursor_1.1.1.tgz"; + name = "prosemirror_commands___prosemirror_commands_1.1.7.tgz"; path = fetchurl { - name = "prosemirror_dropcursor___prosemirror_dropcursor_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.1.1.tgz"; - sha1 = "c60ed1ed6c58804a06a75db06a0d993b087b7622"; + name = "prosemirror_commands___prosemirror_commands_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.7.tgz"; + sha1 = "5b31ae0fe82835d36d22c780641c0b651f27dd03"; }; } { - name = "prosemirror_gapcursor___prosemirror_gapcursor_1.0.3.tgz"; + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.3.tgz"; path = fetchurl { - name = "prosemirror_gapcursor___prosemirror_gapcursor_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.3.tgz"; - sha1 = "acc6537fc5a35e9b38966f91a199a382dfc715c4"; + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.3.tgz"; + sha1 = "583d6a82b4960d468132c07c40803cc1d697fda4"; }; } { - name = "prosemirror_history___prosemirror_history_1.0.3.tgz"; + name = "prosemirror_gapcursor___prosemirror_gapcursor_1.1.5.tgz"; path = fetchurl { - name = "prosemirror_history___prosemirror_history_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.0.3.tgz"; - sha1 = "5fb8591adfc272afaaf0b41bec64ee7d9522a118"; + name = "prosemirror_gapcursor___prosemirror_gapcursor_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz"; + sha1 = "0c37fd6cbb1d7c46358c2e7397f8da9a8b5c6246"; }; } { - name = "prosemirror_inputrules___prosemirror_inputrules_1.0.1.tgz"; + name = "prosemirror_history___prosemirror_history_1.1.3.tgz"; path = fetchurl { - name = "prosemirror_inputrules___prosemirror_inputrules_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.0.1.tgz"; - sha1 = "f63305fd966379f218e82ca76a2a9b328b66dc7b"; + name = "prosemirror_history___prosemirror_history_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.1.3.tgz"; + sha1 = "4f76a1e71db4ef7cdf0e13dec6d8da2aeaecd489"; }; } { - name = "prosemirror_keymap___prosemirror_keymap_1.0.1.tgz"; + name = "prosemirror_inputrules___prosemirror_inputrules_1.1.3.tgz"; path = fetchurl { - name = "prosemirror_keymap___prosemirror_keymap_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.0.1.tgz"; - sha1 = "03ef32b828e3a859dfb570eb84928bf2e5330bc2"; + name = "prosemirror_inputrules___prosemirror_inputrules_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.3.tgz"; + sha1 = "93f9199ca02473259c30d7e352e4c14022d54638"; }; } { - name = "prosemirror_markdown___prosemirror_markdown_1.3.0.tgz"; + name = "prosemirror_keymap___prosemirror_keymap_1.1.4.tgz"; path = fetchurl { - name = "prosemirror_markdown___prosemirror_markdown_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.3.0.tgz"; - sha1 = "a100d14c27da7d8fb70818230d786898eeadb7fa"; + name = "prosemirror_keymap___prosemirror_keymap_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz"; + sha1 = "8b481bf8389a5ac40d38dbd67ec3da2c7eac6a6d"; }; } { - name = "prosemirror_model___prosemirror_model_1.6.4.tgz"; + name = "prosemirror_markdown___prosemirror_markdown_1.5.1.tgz"; path = fetchurl { - name = "prosemirror_model___prosemirror_model_1.6.4.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.6.4.tgz"; - sha1 = "2ac37a629448a7dbfd1635450e2fdd63c3450d7d"; + name = "prosemirror_markdown___prosemirror_markdown_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.5.1.tgz"; + sha1 = "877c7faea2225d3c52e988599bbe4457bcb3190f"; }; } { - name = "prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz"; + name = "prosemirror_model___prosemirror_model_1.13.3.tgz"; path = fetchurl { - name = "prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.0.1.tgz"; - sha1 = "f216e0cf4809b6074aa27912449ac89897f1ae94"; + name = "prosemirror_model___prosemirror_model_1.13.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.13.3.tgz"; + sha1 = "3ccfde73b9c9e706933c72bdf7462906509ff1c9"; }; } { - name = "prosemirror_state___prosemirror_state_1.2.2.tgz"; + name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz"; path = fetchurl { - name = "prosemirror_state___prosemirror_state_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.2.2.tgz"; - sha1 = "8df26d95fd6fd327c0f9984a760e84d863204154"; + name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz"; + sha1 = "471f9caf2d2bed93641d2e490434c0d2d4330df1"; }; } { - name = "prosemirror_tables___prosemirror_tables_0.7.10.tgz"; + name = "prosemirror_state___prosemirror_state_1.3.4.tgz"; path = fetchurl { - name = "prosemirror_tables___prosemirror_tables_0.7.10.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-0.7.10.tgz"; - sha1 = "4b0f623422b4b8f84cdc9c559f8a87579846b3ba"; + name = "prosemirror_state___prosemirror_state_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.4.tgz"; + sha1 = "4c6b52628216e753fc901c6d2bfd84ce109e8952"; }; } { - name = "prosemirror_transform___prosemirror_transform_1.1.3.tgz"; + name = "prosemirror_tables___prosemirror_tables_1.1.1.tgz"; path = fetchurl { - name = "prosemirror_transform___prosemirror_transform_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.1.3.tgz"; - sha1 = "28cfdf1f9ee514edc40466be7b7db39eed545fdf"; + name = "prosemirror_tables___prosemirror_tables_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz"; + sha1 = "ad66300cc49500455cf1243bb129c9e7d883321e"; }; } { - name = "prosemirror_utils___prosemirror_utils_0.7.5.tgz"; + name = "prosemirror_transform___prosemirror_transform_1.2.12.tgz"; path = fetchurl { - name = "prosemirror_utils___prosemirror_utils_0.7.5.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.7.5.tgz"; - sha1 = "11b477647b672ec8f10679ab298a5823dad6457a"; + name = "prosemirror_transform___prosemirror_transform_1.2.12.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.12.tgz"; + sha1 = "4398b568faf75a1540fbf5c659ca436a8657ed6f"; }; } { - name = "prosemirror_view___prosemirror_view_1.6.8.tgz"; + name = "prosemirror_view___prosemirror_view_1.18.0.tgz"; path = fetchurl { - name = "prosemirror_view___prosemirror_view_1.6.8.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.6.8.tgz"; - sha1 = "33fc1a6e2731633e5d6dc1af1967378f15810b74"; + name = "prosemirror_view___prosemirror_view_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.18.0.tgz"; + sha1 = "92d27b2583877938c529e173e6e3a0f3f6aa0e1c"; }; } { @@ -10658,11 +10602,11 @@ }; } { - name = "quick_lru___quick_lru_1.1.0.tgz"; + name = "quick_lru___quick_lru_4.0.1.tgz"; path = fetchurl { - name = "quick_lru___quick_lru_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz"; - sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8"; + name = "quick_lru___quick_lru_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz"; + sha1 = "5b8878f113a58217848c6482026c73e1ba57727f"; }; } { @@ -10745,14 +10689,6 @@ sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; }; } - { - name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; - path = fetchurl { - name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; - sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; - }; - } { name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; path = fetchurl { @@ -10777,14 +10713,6 @@ sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; }; } - { - name = "read_pkg___read_pkg_3.0.0.tgz"; - path = fetchurl { - name = "read_pkg___read_pkg_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz"; - sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; - }; - } { name = "read_pkg___read_pkg_5.2.0.tgz"; path = fetchurl { @@ -10802,11 +10730,11 @@ }; } { - name = "readable_stream___readable_stream_3.0.6.tgz"; + name = "readable_stream___readable_stream_3.6.0.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.0.6.tgz"; - sha1 = "351302e4c68b5abd6a2ed55376a7f9a25be3057a"; + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; }; } { @@ -10842,11 +10770,11 @@ }; } { - name = "redent___redent_2.0.0.tgz"; + name = "redent___redent_3.0.0.tgz"; path = fetchurl { - name = "redent___redent_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz"; - sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa"; + name = "redent___redent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz"; + sha1 = "e557b7998316bb53c9f1f56fa626352c6963059f"; }; } { @@ -10946,27 +10874,27 @@ }; } { - name = "remark_parse___remark_parse_6.0.3.tgz"; + name = "remark_parse___remark_parse_9.0.0.tgz"; path = fetchurl { - name = "remark_parse___remark_parse_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-6.0.3.tgz"; - sha1 = "c99131052809da482108413f87b0ee7f52180a3a"; + name = "remark_parse___remark_parse_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz"; + sha1 = "4d20a299665880e4f4af5d90b7c7b8a935853640"; }; } { - name = "remark_stringify___remark_stringify_6.0.4.tgz"; + name = "remark_stringify___remark_stringify_9.0.1.tgz"; path = fetchurl { - name = "remark_stringify___remark_stringify_6.0.4.tgz"; - url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-6.0.4.tgz"; - sha1 = "16ac229d4d1593249018663c7bddf28aafc4e088"; + name = "remark_stringify___remark_stringify_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-9.0.1.tgz"; + sha1 = "576d06e910548b0a7191a71f27b33f1218862894"; }; } { - name = "remark___remark_10.0.1.tgz"; + name = "remark___remark_13.0.0.tgz"; path = fetchurl { - name = "remark___remark_10.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark/-/remark-10.0.1.tgz"; - sha1 = "3058076dc41781bf505d8978c291485fe47667df"; + name = "remark___remark_13.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark/-/remark-13.0.0.tgz"; + sha1 = "d15d9bf71a402f40287ebe36067b66d54868e425"; }; } { @@ -11001,14 +10929,6 @@ sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; } - { - name = "replace_ext___replace_ext_1.0.0.tgz"; - path = fetchurl { - name = "replace_ext___replace_ext_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz"; - sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; - }; - } { name = "request_light___request_light_0.2.5.tgz"; path = fetchurl { @@ -11185,6 +11105,14 @@ sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; }; } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + }; + } { name = "rfdc___rfdc_1.1.4.tgz"; path = fetchurl { @@ -11218,11 +11146,11 @@ }; } { - name = "rope_sequence___rope_sequence_1.2.2.tgz"; + name = "rope_sequence___rope_sequence_1.3.2.tgz"; path = fetchurl { - name = "rope_sequence___rope_sequence_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.2.2.tgz"; - sha1 = "49c4e5c2f54a48e990b050926771e2871bcb31ce"; + name = "rope_sequence___rope_sequence_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz"; + sha1 = "a19e02d72991ca71feb6b5f8a91154e48e3c098b"; }; } { @@ -11241,6 +11169,14 @@ sha1 = "b50e6b34583f3dd89329a2f23a8a2be072845911"; }; } + { + name = "run_parallel___run_parallel_1.1.10.tgz"; + path = fetchurl { + name = "run_parallel___run_parallel_1.1.10.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz"; + sha1 = "60a51b2ae836636c81377df16cb107351bcd13ef"; + }; + } { name = "run_queue___run_queue_1.0.3.tgz"; path = fetchurl { @@ -11409,14 +11345,6 @@ sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; }; } - { - name = "semver___semver_7.3.4.tgz"; - path = fetchurl { - name = "semver___semver_7.3.4.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; - sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; - }; - } { name = "semver___semver_6.3.0.tgz"; path = fetchurl { @@ -11425,6 +11353,14 @@ sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; }; } + { + name = "semver___semver_7.3.4.tgz"; + path = fetchurl { + name = "semver___semver_7.3.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; + sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + }; + } { name = "semver___semver_5.3.0.tgz"; path = fetchurl { @@ -11569,6 +11505,14 @@ sha1 = "d6b9181c1a48d397324c84871efbcfc73fc0654b"; }; } + { + name = "shortcss___shortcss_0.1.3.tgz"; + path = fetchurl { + name = "shortcss___shortcss_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/shortcss/-/shortcss-0.1.3.tgz"; + sha1 = "ee2a7904d80b7f5502c98408f4a2f313faadfb48"; + }; + } { name = "sigmund___sigmund_1.0.1.tgz"; path = fetchurl { @@ -11601,14 +11545,6 @@ sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; }; } - { - name = "slash___slash_2.0.0.tgz"; - path = fetchurl { - name = "slash___slash_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz"; - sha1 = "de552851a1759df3a8f206535442f5ec4ddeab44"; - }; - } { name = "slash___slash_3.0.0.tgz"; path = fetchurl { @@ -11617,14 +11553,6 @@ sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; }; } - { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; - }; - } { name = "slice_ansi___slice_ansi_4.0.0.tgz"; path = fetchurl { @@ -11905,14 +11833,6 @@ sha1 = "5cf48b4557becb4638d0bc4f21d23f5d19586593"; }; } - { - name = "state_toggle___state_toggle_1.0.1.tgz"; - path = fetchurl { - name = "state_toggle___state_toggle_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.1.tgz"; - sha1 = "c3cb0974f40a6a0f8e905b96789eb41afa1cde3a"; - }; - } { name = "static_extend___static_extend_0.1.2.tgz"; path = fetchurl { @@ -12065,14 +11985,6 @@ sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; }; } - { - name = "stringify_entities___stringify_entities_1.3.2.tgz"; - path = fetchurl { - name = "stringify_entities___stringify_entities_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.2.tgz"; - sha1 = "a98417e5471fd227b3e45d3db1861c11caf668f7"; - }; - } { name = "strip_ansi___strip_ansi_3.0.1.tgz"; path = fetchurl { @@ -12154,11 +12066,11 @@ }; } { - name = "strip_indent___strip_indent_2.0.0.tgz"; + name = "strip_indent___strip_indent_3.0.0.tgz"; path = fetchurl { - name = "strip_indent___strip_indent_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz"; - sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68"; + name = "strip_indent___strip_indent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz"; + sha1 = "c32e1cee940b6b3432c771bc2c54bcce73cd3001"; }; } { @@ -12194,27 +12106,27 @@ }; } { - name = "stylelint_config_recommended___stylelint_config_recommended_2.2.0.tgz"; + name = "stylelint_declaration_strict_value___stylelint_declaration_strict_value_1.7.7.tgz"; path = fetchurl { - name = "stylelint_config_recommended___stylelint_config_recommended_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.2.0.tgz"; - sha1 = "46ab139db4a0e7151fd5f94af155512886c96d3f"; + name = "stylelint_declaration_strict_value___stylelint_declaration_strict_value_1.7.7.tgz"; + url = "https://registry.yarnpkg.com/stylelint-declaration-strict-value/-/stylelint-declaration-strict-value-1.7.7.tgz"; + sha1 = "d2f0aabc7f3e701a8988207f27d9696bd1d1ed0d"; }; } { - name = "stylelint_scss___stylelint_scss_3.9.2.tgz"; + name = "stylelint_scss___stylelint_scss_3.18.0.tgz"; path = fetchurl { - name = "stylelint_scss___stylelint_scss_3.9.2.tgz"; - url = "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.9.2.tgz"; - sha1 = "5435174a57696ee52eae40146778a4e62f7ed3a3"; + name = "stylelint_scss___stylelint_scss_3.18.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.18.0.tgz"; + sha1 = "8f06371c223909bf3f62e839548af1badeed31e9"; }; } { - name = "stylelint___stylelint_10.1.0.tgz"; + name = "stylelint___stylelint_13.9.0.tgz"; path = fetchurl { - name = "stylelint___stylelint_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/stylelint/-/stylelint-10.1.0.tgz"; - sha1 = "1bc4c4ce878107e7c396b19226d91ba28268911a"; + name = "stylelint___stylelint_13.9.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint/-/stylelint-13.9.0.tgz"; + sha1 = "93921ee6e11d4556b9f31131f485dc813b68e32a"; }; } { @@ -12282,11 +12194,11 @@ }; } { - name = "swagger_ui_dist___swagger_ui_dist_3.43.0.tgz"; + name = "swagger_ui_dist___swagger_ui_dist_3.44.1.tgz"; path = fetchurl { - name = "swagger_ui_dist___swagger_ui_dist_3.43.0.tgz"; - url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.43.0.tgz"; - sha1 = "b064a2cec1d27776f9a124bc70423cfa0bbc0d3f"; + name = "swagger_ui_dist___swagger_ui_dist_3.44.1.tgz"; + url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.44.1.tgz"; + sha1 = "757385a79698b8ef7045287be585671db4e4a252"; }; } { @@ -12305,14 +12217,6 @@ sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2"; }; } - { - name = "table___table_5.4.4.tgz"; - path = fetchurl { - name = "table___table_5.4.4.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-5.4.4.tgz"; - sha1 = "6e0f88fdae3692793d1077fd172a4667afe986a6"; - }; - } { name = "table___table_6.0.7.tgz"; path = fetchurl { @@ -12506,35 +12410,35 @@ }; } { - name = "tiptap_commands___tiptap_commands_1.4.0.tgz"; + name = "tiptap_commands___tiptap_commands_1.17.1.tgz"; path = fetchurl { - name = "tiptap_commands___tiptap_commands_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.4.0.tgz"; - sha1 = "0cfb3ac138ee3099de56114cb119abd841fbcbe7"; + name = "tiptap_commands___tiptap_commands_1.17.1.tgz"; + url = "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.17.1.tgz"; + sha1 = "a8974a26d87db57b2fd4fc56a552520c69e43a4a"; }; } { - name = "tiptap_extensions___tiptap_extensions_1.8.0.tgz"; + name = "tiptap_extensions___tiptap_extensions_1.35.1.tgz"; path = fetchurl { - name = "tiptap_extensions___tiptap_extensions_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.8.0.tgz"; - sha1 = "3067620a024f1a9e5fae4450790b143d7ebe4394"; + name = "tiptap_extensions___tiptap_extensions_1.35.1.tgz"; + url = "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.35.1.tgz"; + sha1 = "6227362b08dbad8d0ab0141b508876deca276c55"; }; } { - name = "tiptap_utils___tiptap_utils_1.1.1.tgz"; + name = "tiptap_utils___tiptap_utils_1.13.1.tgz"; path = fetchurl { - name = "tiptap_utils___tiptap_utils_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.1.1.tgz"; - sha1 = "e7aad3e84eb35f7abed704d15da0420029789d0d"; + name = "tiptap_utils___tiptap_utils_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.13.1.tgz"; + sha1 = "f2150ded432465d66aa03a5ab333803415cddd20"; }; } { - name = "tiptap___tiptap_1.8.0.tgz"; + name = "tiptap___tiptap_1.32.1.tgz"; path = fetchurl { - name = "tiptap___tiptap_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/tiptap/-/tiptap-1.8.0.tgz"; - sha1 = "c671188075ffa5ee4f86470f95818fd9ce6f1040"; + name = "tiptap___tiptap_1.32.1.tgz"; + url = "https://registry.yarnpkg.com/tiptap/-/tiptap-1.32.1.tgz"; + sha1 = "92b47008d163e31d25d44dc18809a7e928fe1daf"; }; } { @@ -12674,35 +12578,19 @@ }; } { - name = "trim_newlines___trim_newlines_2.0.0.tgz"; + name = "trim_newlines___trim_newlines_3.0.0.tgz"; path = fetchurl { - name = "trim_newlines___trim_newlines_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz"; - sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; + name = "trim_newlines___trim_newlines_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz"; + sha1 = "79726304a6a898aa8373427298d54c2ee8b1cb30"; }; } { - name = "trim_trailing_lines___trim_trailing_lines_1.1.1.tgz"; + name = "trough___trough_1.0.5.tgz"; path = fetchurl { - name = "trim_trailing_lines___trim_trailing_lines_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz"; - sha1 = "e0ec0810fd3c3f1730516b45f49083caaf2774d9"; - }; - } - { - name = "trim___trim_0.0.1.tgz"; - path = fetchurl { - name = "trim___trim_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz"; - sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; - }; - } - { - name = "trough___trough_1.0.3.tgz"; - path = fetchurl { - name = "trough___trough_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/trough/-/trough-1.0.3.tgz"; - sha1 = "e29bd1614c6458d44869fc28b255ab7857ef7c24"; + name = "trough___trough_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz"; + sha1 = "b8b639cefad7d0bb2abd37d433ff8293efa5f406"; }; } { @@ -12745,14 +12633,6 @@ sha1 = "97a523518688f93aafad01b0e80eb803eb2abd86"; }; } - { - name = "ts_jest___ts_jest_26.4.1.tgz"; - path = fetchurl { - name = "ts_jest___ts_jest_26.4.1.tgz"; - url = "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.1.tgz"; - sha1 = "08ec0d3fc2c3a39e4a46eae5610b69fafa6babd0"; - }; - } { name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; path = fetchurl { @@ -12825,6 +12705,14 @@ sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; }; } + { + name = "type_fest___type_fest_0.18.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz"; + sha1 = "db4bc151a4a2cf4eebf9add5db75508db6cc841f"; + }; + } { name = "type_fest___type_fest_0.6.0.tgz"; path = fetchurl { @@ -12929,14 +12817,6 @@ sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; }; } - { - name = "unherit___unherit_1.1.1.tgz"; - path = fetchurl { - name = "unherit___unherit_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.1.tgz"; - sha1 = "132748da3e88eab767e08fabfbb89c5e9d28628c"; - }; - } { name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; path = fetchurl { @@ -12970,11 +12850,11 @@ }; } { - name = "unified___unified_7.1.0.tgz"; + name = "unified___unified_9.2.0.tgz"; path = fetchurl { - name = "unified___unified_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/unified/-/unified-7.1.0.tgz"; - sha1 = "5032f1c1ee3364bd09da12e27fdd4a7553c7be13"; + name = "unified___unified_9.2.0.tgz"; + url = "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz"; + sha1 = "67a62c627c40589edebbf60f53edfd4d822027f8"; }; } { @@ -13018,51 +12898,27 @@ }; } { - name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz"; + name = "unist_util_find_all_after___unist_util_find_all_after_3.0.2.tgz"; path = fetchurl { - name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.2.tgz"; - sha1 = "9be49cfbae5ca1566b27536670a92836bf2f8d6d"; + name = "unist_util_find_all_after___unist_util_find_all_after_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz"; + sha1 = "fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6"; }; } { - name = "unist_util_is___unist_util_is_2.1.2.tgz"; + name = "unist_util_is___unist_util_is_4.0.4.tgz"; path = fetchurl { - name = "unist_util_is___unist_util_is_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.2.tgz"; - sha1 = "1193fa8f2bfbbb82150633f3a8d2eb9a1c1d55db"; + name = "unist_util_is___unist_util_is_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.4.tgz"; + sha1 = "3e9e8de6af2eb0039a59f50c9b3e99698a924f50"; }; } { - name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz"; + name = "unist_util_stringify_position___unist_util_stringify_position_2.0.3.tgz"; path = fetchurl { - name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz"; - sha1 = "86b5dad104d0bbfbeb1db5f5c92f3570575c12cb"; - }; - } - { - name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz"; - path = fetchurl { - name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz"; - sha1 = "3f37fcf351279dcbca7480ab5889bb8a832ee1c6"; - }; - } - { - name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz"; - path = fetchurl { - name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz"; - sha1 = "63fffc8929027bee04bfef7d2cce474f71cb6217"; - }; - } - { - name = "unist_util_visit___unist_util_visit_1.4.1.tgz"; - path = fetchurl { - name = "unist_util_visit___unist_util_visit_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz"; - sha1 = "4724aaa8486e6ee6e26d7ff3c8685960d560b1e3"; + name = "unist_util_stringify_position___unist_util_stringify_position_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz"; + sha1 = "cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"; }; } { @@ -13290,27 +13146,19 @@ }; } { - name = "vfile_location___vfile_location_2.0.4.tgz"; + name = "vfile_message___vfile_message_2.0.4.tgz"; path = fetchurl { - name = "vfile_location___vfile_location_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.4.tgz"; - sha1 = "2a5e7297dd0d9e2da4381464d04acc6b834d3e55"; + name = "vfile_message___vfile_message_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz"; + sha1 = "5b43b88171d409eae58477d13f23dd41d52c371a"; }; } { - name = "vfile_message___vfile_message_1.1.1.tgz"; + name = "vfile___vfile_4.2.1.tgz"; path = fetchurl { - name = "vfile_message___vfile_message_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz"; - sha1 = "5833ae078a1dfa2d96e9647886cd32993ab313e1"; - }; - } - { - name = "vfile___vfile_3.0.1.tgz"; - path = fetchurl { - name = "vfile___vfile_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/vfile/-/vfile-3.0.1.tgz"; - sha1 = "47331d2abe3282424f4a4bb6acd20a44c4121803"; + name = "vfile___vfile_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz"; + sha1 = "03f1dce28fc625c625bc6514350fbdb00fa9e624"; }; } { @@ -13466,11 +13314,11 @@ }; } { - name = "vue_jest___vue_jest_4.0.0_rc.0.tgz"; + name = "vue_jest___vue_jest_4.0.1.tgz"; path = fetchurl { - name = "vue_jest___vue_jest_4.0.0_rc.0.tgz"; - url = "https://registry.yarnpkg.com/vue-jest/-/vue-jest-4.0.0-rc.0.tgz"; - sha1 = "0ce263c7f923441d0eeb99841620e8e9470336f4"; + name = "vue_jest___vue_jest_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/vue-jest/-/vue-jest-4.0.1.tgz"; + sha1 = "683efc351c24456865b1356bae69d5bb663dafb5"; }; } { @@ -13562,11 +13410,11 @@ }; } { - name = "w3c_keyname___w3c_keyname_1.1.8.tgz"; + name = "w3c_keyname___w3c_keyname_2.2.4.tgz"; path = fetchurl { - name = "w3c_keyname___w3c_keyname_1.1.8.tgz"; - url = "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-1.1.8.tgz"; - sha1 = "4e2219663760fd6535b7a1550f1552d71fc9372c"; + name = "w3c_keyname___w3c_keyname_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.4.tgz"; + sha1 = "4ade6916f6290224cdbd1db8ac49eab03d0eef6b"; }; } { @@ -13841,14 +13689,6 @@ sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; }; } - { - name = "write___write_1.0.3.tgz"; - path = fetchurl { - name = "write___write_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; - sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; - }; - } { name = "ws___ws_6.2.1.tgz"; path = fetchurl { @@ -13873,14 +13713,6 @@ sha1 = "f1cf84fe2d5e901ebce94efaece785f187a228f2"; }; } - { - name = "x_is_string___x_is_string_0.1.0.tgz"; - path = fetchurl { - name = "x_is_string___x_is_string_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz"; - sha1 = "474b50865af3a49a9c4657f05acd145458f77d82"; - }; - } { name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; path = fetchurl { @@ -14026,19 +13858,11 @@ }; } { - name = "yargs_parser___yargs_parser_20.2.1.tgz"; + name = "yaml___yaml_1.10.0.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha1 = "28f3773c546cdd8a69ddae68116b48a5da328e77"; - }; - } - { - name = "yargs_parser___yargs_parser_10.1.0.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz"; - sha1 = "7202265b89f7e9e9f2e5765e0fe735a905edbaa8"; + name = "yaml___yaml_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz"; + sha1 = "3b593add944876077d4d683fee01081bd9fff31e"; }; } { @@ -14057,6 +13881,14 @@ sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0"; }; } + { + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz"; + sha1 = "b42890f14566796f85ae8e3a25290d205f154a54"; + }; + } { name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { @@ -14121,5 +13953,13 @@ sha1 = "ec7432f9415c82c73584b6b7b8c47e1b016209c6"; }; } + { + name = "zwitch___zwitch_1.0.5.tgz"; + path = fetchurl { + name = "zwitch___zwitch_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz"; + sha1 = "d11d7381ffed16b742f6af7b3f223d5cd9fe9920"; + }; + } ]; } diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 3f1c2190a3c..5ca2612cc6f 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -25,7 +25,7 @@ , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk -, bundler, libsass, libselinux ? null, libsepol ? null +, bundler, libsass, libselinux ? null, libsepol ? null, shared-mime-info }@args: let @@ -164,6 +164,10 @@ in ''; }; + mimemagic = attrs: { + FREEDESKTOP_MIME_TYPES_PATH = "${shared-mime-info}/share/mime/packages/freedesktop.org.xml"; + }; + mini_magick = attrs: { postInstall = '' installPath=$(cat $out/nix-support/gem-meta/install-path) From 9c529802fa5d13f4b29578b2064a725b5a8af452 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 8 Apr 2021 05:39:30 +0800 Subject: [PATCH 55/89] linux_xanmod: 5.11.10 -> 5.11.12 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index ab01a4bcc27..efb87df6c97 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.11.10"; + version = "5.11.12"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,7 +12,7 @@ in owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-Pn1rX61mA8FEt5G1GppK/YyzXnB+hdm5pWh/4swQ4VE="; + sha256 = "sha256-omRZ9oAmW3mauUolPf/lgMFMwUCYU4YaZ+OS75Ag+lM="; extraPostFetch = '' rm $out/.config ''; From 7485b524dd38812c8bd45b1966cd0a587c8d1e80 Mon Sep 17 00:00:00 2001 From: ciferkey Date: Wed, 7 Apr 2021 17:44:43 -0400 Subject: [PATCH 56/89] yaru-theme: 20.10.6.1 -> 21.04.1 --- pkgs/data/themes/yaru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 29176c664ca..f0d2493473a 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "20.10.6.1"; + version = "21.04.1"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "0kcmxfz2rfav7aj5v1vv335vqzyj0n53lbhwx0g6gxxfi0x3vv6v"; + sha256 = "0z6k8q9b5xjx6xwirqbsqq5jjxw79ar2d61r7cgipqmbjdsjfgjz"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; From 54db6aaf6e4fd9fa752f7f19f7b82a0f1d3bd799 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Apr 2021 00:08:54 +0200 Subject: [PATCH 57/89] python3Packages.wakeonlan: 1.1.6 -> 2.0.0 --- .../python-modules/wakeonlan/default.nix | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 86d405a33ef..340a407ab3f 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -1,26 +1,45 @@ -{ lib, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "wakeonlan"; - version = "1.1.6"; + version = "2.0.0"; + disabled = pythonOlder "3.6"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "5e6013a17004809e676c150689abd94bcc0f12a37ad3fbce1f6270968f95ffa9"; + src = fetchFromGitHub { + owner = "remcohaszing"; + repo = "pywakeonlan"; + rev = version; + sha256 = "0p9jyiv0adcymbnmbay72g9phlbhsr4kmrwxscbdjq81gcmxsi0y"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "setuptools-scm ~= 1.15.7" "setuptools-scm" - ''; + nativeBuildInputs = [ + poetry-core + ]; - checkInputs = [ pytest mock ]; + checkInputs = [ + pytestCheckHook + ]; - nativeBuildInputs = [ setuptools_scm ]; + patches = [ + # Switch to poetry-core, https://github.com/remcohaszing/pywakeonlan/pull/19 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/remcohaszing/pywakeonlan/commit/6aa5050ed94ef718dfcd0b946546b6a738f47ee3.patch"; + sha256 = "1xzj2464ziwm7bp05bzbjwjp9whmgp1py3isr41d92qvnil86vm6"; + }) + ]; - checkPhase = '' - py.test - ''; + pytestFlagsArray = [ "test_wakeonlan.py" ]; + + pythonImportsCheck = [ "wakeonlan" ]; meta = with lib; { description = "A small python module for wake on lan"; From 61f566d45b1a15bbb1a029ca016a9938d5f98f85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Apr 2021 23:18:02 +0200 Subject: [PATCH 58/89] python3Packages.pytest-raises: init at 0.11 --- .../python-modules/pytest-raises/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 ++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-raises/default.nix diff --git a/pkgs/development/python-modules/pytest-raises/default.nix b/pkgs/development/python-modules/pytest-raises/default.nix new file mode 100644 index 00000000000..7891437909e --- /dev/null +++ b/pkgs/development/python-modules/pytest-raises/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-raises"; + version = "0.11"; + + src = fetchFromGitHub { + owner = "Lemmons"; + repo = pname; + rev = version; + sha256 = "0gbb4kml2qv7flp66i73mgb4qihdaybb6c96b5dw3mhydhymcsy2"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pytest_raises" ]; + + meta = with lib; { + description = "An implementation of pytest.raises as a pytest.mark fixture"; + homepage = "https://github.com/Lemmons/pytest-raises"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10da6e1f33c..4e0af09e84d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -236,6 +236,8 @@ in { aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; + aiodiscover = callPackage ../development/python-modules/aiodiscover { }; + aiodns = callPackage ../development/python-modules/aiodns { }; aioeafm = callPackage ../development/python-modules/aioeafm { }; @@ -538,6 +540,8 @@ in { async_generator = callPackage ../development/python-modules/async_generator { }; + async-dns = callPackage ../development/python-modules/async-dns { }; + asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { }; @@ -6567,6 +6571,8 @@ in { pytest-quickcheck = self.pytestquickcheck; pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; + pytest-raises = callPackage ../development/python-modules/pytest-raises { }; + pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; pytest-randomly = callPackage ../development/python-modules/pytest-randomly { }; From 4a238865363c4277288351ff4e710de21ee7c7d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Apr 2021 23:18:36 +0200 Subject: [PATCH 59/89] python3Packages.async-dns: init at 1.1.9 --- .../python-modules/async-dns/default.nix | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/async-dns/default.nix diff --git a/pkgs/development/python-modules/async-dns/default.nix b/pkgs/development/python-modules/async-dns/default.nix new file mode 100644 index 00000000000..fdf240f5ba9 --- /dev/null +++ b/pkgs/development/python-modules/async-dns/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, python +, pythonOlder +}: + +buildPythonPackage rec { + pname = "async-dns"; + version = "1.1.9"; + disabled = pythonOlder "3.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "gera2ld"; + repo = "async_dns"; + rev = "v${version}"; + sha256 = "1z8j0s3dwcyavarhx41q75k1cmfzmwiqdh4svv3v15np26cywyag"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + patches = [ + # Switch to poetry-core, https://github.com/gera2ld/async_dns/pull/22 + # Can be remove for async-dns>1.1.9 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/gera2ld/async_dns/commit/25fee497aae3bde0ddf9f8804d249a27edbe607e.patch"; + sha256 = "0w4zlppnp1a2q1wasc95ymqx3djswl32y5nw6fvz3nn8jg4gc743"; + }) + ]; + + checkPhase = '' + export HOME=$TMPDIR + # Test needs network access + rm tests/test_resolver.py + ${python.interpreter} -m unittest + ''; + + pythonImportsCheck = [ "async_dns" ]; + + meta = with lib; { + description = "Python DNS library"; + homepage = "https://github.com/gera2ld/async_dns"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} From eca0abfd504e6380ace27c00386d385a95d962c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Apr 2021 23:29:44 +0200 Subject: [PATCH 60/89] python3Packages.aiodiscover: init at 1.3.2 --- .../python-modules/aiodiscover/default.nix | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/aiodiscover/default.nix diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix new file mode 100644 index 00000000000..923be510c45 --- /dev/null +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -0,0 +1,51 @@ +{ lib +, async-dns +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, ifaddr +, pyroute2 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiodiscover"; + version = "1.3.2"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = "v${version}"; + sha256 = "0qg2wm6ddsfai788chylr5ynrvakwg91q3dszz7dxzbkfdcxixj3"; + }; + + patches = [ + (fetchpatch { + name = "remove-entry_point.patch"; + url = "https://github.com/bdraco/aiodiscover/commit/4c497fb7d4c8685a78209c710e92e0bd17f46bb2.patch"; + sha256 = "0py9alhg6qdncbn6a04mrnjhs4j19kg759dv69knpqzryikcfa63"; + }) + ]; + + propagatedBuildInputs = [ + async-dns + pyroute2 + ifaddr + ]; + + postPatch = '' + substituteInPlace setup.py --replace '"pytest-runner>=5.2",' "" + ''; + + # Tests require access to /etc/resolv.conf + # pythonImportsCheck doesn't work as async-dns wants to create its CONFIG_DIR + doCheck = false; + + meta = with lib; { + description = "Python module to discover hosts via ARP and PTR lookup"; + homepage = "https://github.com/bdraco/aiodiscover"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} From 529811ddcb732720ace1f0ebe5da77f15c05a277 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Apr 2021 00:57:19 +0200 Subject: [PATCH 61/89] python3Packages.screenlogicpy: init at 0.3.0 --- .../python-modules/screenlogicpy/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/screenlogicpy/default.nix diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix new file mode 100644 index 00000000000..100c487acee --- /dev/null +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "screenlogicpy"; + version = "0.3.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gn2mf2n2g1ffdbijrydgb7dgd60lkvckblx6s86kxlkrp1wqgrq"; + }; + + # Project doesn't publish tests + # https://github.com/dieselrabbit/screenlogicpy/issues/8 + doCheck = false; + pythonImportsCheck = [ "screenlogicpy" ]; + + meta = with lib; { + description = "Python interface for Pentair Screenlogic devices"; + homepage = "https://github.com/dieselrabbit/screenlogicpy"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10da6e1f33c..35a4bf85319 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7534,6 +7534,8 @@ in { screeninfo = callPackage ../development/python-modules/screeninfo { }; + screenlogicpy = callPackage ../development/python-modules/screenlogicpy { }; + scripttest = callPackage ../development/python-modules/scripttest { }; scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; From c33772a78197885cc00b8f35c77aa8cda5068af8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Apr 2021 00:43:47 +0200 Subject: [PATCH 62/89] python3Packages.yalexs: init at 1.1.10 --- .../python-modules/yalexs/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/yalexs/default.nix diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix new file mode 100644 index 00000000000..c65c88b88d5 --- /dev/null +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -0,0 +1,58 @@ +{ lib +, aiofiles +, aiohttp +, aioresponses +, aiounittest +, asynctest +, buildPythonPackage +, fetchFromGitHub +, pubnub +, pytestCheckHook +, python-dateutil +, pythonOlder +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "yalexs"; + version = "1.1.10"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = "v${version}"; + sha256 = "1qmxiafqmh51i3l30pajaqj5h0kziq4d37fn6hl58429bb85dpp9"; + }; + + propagatedBuildInputs = [ + aiofiles + aiohttp + pubnub + python-dateutil + requests + ]; + + checkInputs = [ + aioresponses + aiounittest + asynctest + pytestCheckHook + requests-mock + ]; + + postPatch = '' + # Not used requirement + substituteInPlace setup.py --replace '"vol",' "" + ''; + + pythonImportsCheck = [ "yalexs" ]; + + meta = with lib; { + description = "Python API for Yale Access (formerly August) Smart Lock and Doorbell"; + homepage = "https://github.com/bdraco/yalexs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10da6e1f33c..6025efface9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9025,6 +9025,8 @@ in { yalesmartalarmclient = callPackage ../development/python-modules/yalesmartalarmclient { }; + yalexs = callPackage ../development/python-modules/yalexs { }; + yamale = callPackage ../development/python-modules/yamale { }; yamllint = callPackage ../development/python-modules/yamllint { }; From 712ab79af54d64a7594894861cd2650e51290586 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Apr 2021 01:14:19 +0200 Subject: [PATCH 63/89] python3Packages.pubnub: 4.8.0 -> 5.1.1 --- .../python-modules/pubnub/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 8c9c0ea004c..c2f1a9fb34d 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,16 +13,17 @@ buildPythonPackage rec { pname = "pubnub"; - version = "4.8.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = pname; repo = "python"; rev = "v${version}"; - sha256 = "16wjal95042kh5fxhvji0rwmw892pacqcnyms520mw15wcwilqir"; + sha256 = "sha256-ir8f8A6XuN1ZQIYQbArChLzTlYu4ZKpkoOXQtSLOvKg="; }; propagatedBuildInputs = [ + aiohttp cbor2 pycryptodomex requests @@ -30,19 +31,15 @@ buildPythonPackage rec { ]; checkInputs = [ - aiohttp - pycryptodomex pytest-asyncio pytestCheckHook pytest-vcr - ]; - # Some tests don't pass with recent releases of tornado/twisted - pytestFlagsArray = [ - "--ignore tests/integrational" - "--ignore tests/manual/asyncio" - "--ignore tests/manual/tornado/test_reconnections.py" + # Some tests don't pass with recent releases of twisted + disabledTestPaths = [ + "tests/integrational" + "tests/manual/asyncio" ]; pythonImportsCheck = [ "pubnub" ]; From 7e1a972bc0f15f91837b6aff9bc898bc6d130e04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Apr 2021 01:29:52 +0200 Subject: [PATCH 64/89] python3Packages.homepluscontrol: init at 0.0.5 --- .../homepluscontrol/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/homepluscontrol/default.nix diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix new file mode 100644 index 00000000000..680c4a5a726 --- /dev/null +++ b/pkgs/development/python-modules/homepluscontrol/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pyjwt +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "homepluscontrol"; + version = "0.0.5"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "chemaaa"; + repo = pname; + rev = version; + sha256 = "1nd3a7nhh1xb70cdh2h2bimwbffvpc3457smyzr9fqkjwfbcrr93"; + }; + + propagatedBuildInputs = [ + aiohttp + pyjwt + yarl + ]; + + checkInputs = [ + aioresponses + pytestCheckHook + ]; + + pythonImportsCheck = [ "homepluscontrol" ]; + + meta = with lib; { + description = "Python API to interact with the Legrand Eliot Home and Control"; + homepage = "https://github.com/chemaaa/homepluscontrol"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10da6e1f33c..3c1323a823e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3112,6 +3112,8 @@ in { homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; + homepluscontrol = callPackage ../development/python-modules/homepluscontrol { }; + hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { inherit python; }); From 8a17db4c8af0ca20ad380c5fd3fbfe10c22acf75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 8 Apr 2021 02:31:05 +0200 Subject: [PATCH 65/89] qcad: 3.26.0.1 -> 3.26.1.0 (#118397) --- pkgs/applications/misc/qcad/default.nix | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 6b2418ab57c..19e5d18fe93 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -10,18 +10,20 @@ , qtsvg , qtxmlpatterns , qttools -, lib, stdenv +, lib +, stdenv +, installShellFiles }: mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.26.0.1"; + version = "3.26.1.0"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-V+QlwM8BWmcarwZtqJfc+MYHOZgIH1W5R8m2EHhNJls="; + sha256 = "sha256-OWAc7g8DiJR3z6dUF5D0Yo3wnRKd1Xe7D1eq15NRW5c="; }; patches = [ @@ -36,7 +38,7 @@ mkDerivationWith stdenv.mkDerivation rec { src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \ src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro fi - ''; + ''; qmakeFlags = [ "MUPARSER_DIR=${muparser}" @@ -65,15 +67,27 @@ mkDerivationWith stdenv.mkDerivation rec { cp -r scripts $out/lib cp -r plugins $out/lib/plugins cp -r patterns $out/lib/patterns + cp -r fonts $out/lib/fonts + cp -r libraries $out/lib/libraries + cp -r linetypes $out/lib/linetypes + cp -r ts $out/lib/ts # workaround to fix the library browser: rm -r $out/lib/plugins/sqldrivers ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers + rm -r $out/lib/plugins/printsupport + ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/printsupport + + rm -r $out/lib/plugins/imageformats + ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/imageformats + install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg + installManPage qcad.1 + runHook postInstall - ''; + ''; buildInputs = [ boost @@ -89,6 +103,7 @@ mkDerivationWith stdenv.mkDerivation rec { pkg-config qmake qttools + installShellFiles ]; meta = with lib; { From d9ed5352d7861864bc937e3b1d85c5d5fba87bfc Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 27 Mar 2021 23:22:31 -0300 Subject: [PATCH 66/89] nodepy-runtime: init at 2.1.5 --- .../python-modules/nodepy-runtime/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/nodepy-runtime/default.nix diff --git a/pkgs/development/python-modules/nodepy-runtime/default.nix b/pkgs/development/python-modules/nodepy-runtime/default.nix new file mode 100644 index 00000000000..5be806e4cef --- /dev/null +++ b/pkgs/development/python-modules/nodepy-runtime/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, localimport +, pathlib2 +, six +}: + +buildPythonPackage rec { + pname = "nodepy-runtime"; + version = "2.1.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-6tSsD76EpCZxkdulv1BcUZtIXGWLG6PuII25J8STygE="; + }; + + propagatedBuildInputs = [ + localimport + pathlib2 + six + ]; + + pythonImportsCheck = [ + "nodepy" + ]; + + meta = with lib; { + homepage = "https://github.com/nodepy/nodepy"; + description = "Runtime for Python inspired by Node.JS"; + longDescription = '' + Node.py is a Python runtime and package manager compatible with CPython + 2.7 and 3.3 – 3.6. It provides a separate import mechanism for modules + inspired by Node.js, bringing dependency management and ease of deployment + for Python applications up to par with other languages without virtual + environments. + + Node.py comes with a built-in package manager that builds on Pip for + standard Python dependencies but also adds the capability to install + packages that are specifically developed for Node.py. To install the + dependencies of the package manager you must specify the [pm] install + extra. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4612a89430b..0f79cc3e101 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2756,6 +2756,8 @@ in nix-template = callPackage ../tools/package-management/nix-template { }; + nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5edbc7bbff7..915651f050c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4627,6 +4627,8 @@ in { nodeenv = callPackage ../development/python-modules/nodeenv { }; + nodepy-runtime = callPackage ../development/python-modules/nodepy-runtime { }; + node-semver = callPackage ../development/python-modules/node-semver { }; noise = callPackage ../development/python-modules/noise { }; From 1e52d002bb71455d6ed5800fe09b719caf8adf19 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 7 Apr 2021 20:55:48 -0400 Subject: [PATCH 67/89] qgroundcontrol: 4.1.1 -> 4.1.2 --- pkgs/applications/science/robotics/qgroundcontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 82959e7f5e3..c4d9605ddf8 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.1.1"; + version = "4.1.2"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -63,7 +63,7 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "1dji7jmwsrgcgzhra94wrgz67ydsdra7p10fw8gbw54gf6ncjfjm"; + sha256 = "16q0g9b1kyan3qhhp5mmfnrx9h8q7qn83baplbiprqjgpvkxfll4"; fetchSubmodules = true; }; From 90691042af87420a51bd0f9c2f85c2ad9f018443 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 8 Apr 2021 05:48:32 +0000 Subject: [PATCH 68/89] libcap: fix static build It supports static build with SHARED=no; the patch no longer applies. Tested by building pkgsStatic.libcap. --- pkgs/os-specific/linux/libcap/default.nix | 4 +--- .../linux/libcap/no-shared-lib.patch | 22 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/os-specific/linux/libcap/no-shared-lib.patch diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 54fab6a7746..871e04648e4 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-TelZDuCah8KC1Vhzf/tbYXXMv9JtWArdEN9E0PBH9sI="; }; - patches = lib.optional isStatic ./no-shared-lib.patch; - outputs = [ "out" "dev" "lib" "man" "doc" ] ++ lib.optional usePam "pam"; @@ -31,7 +29,7 @@ stdenv.mkDerivation rec { "PAM_CAP=${if usePam then "yes" else "no"}" "BUILD_CC=$(CC_FOR_BUILD)" "CC:=$(CC)" - ]; + ] ++ lib.optional isStatic "SHARED=no"; prePatch = '' # use full path to bash diff --git a/pkgs/os-specific/linux/libcap/no-shared-lib.patch b/pkgs/os-specific/linux/libcap/no-shared-lib.patch deleted file mode 100644 index 73dc7de063d..00000000000 --- a/pkgs/os-specific/linux/libcap/no-shared-lib.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/libcap/Makefile b/libcap/Makefile -index de6a28d..7e4d8ac 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -22,7 +22,7 @@ MAJLIBNAME=$(LIBNAME).$(VERSION) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - GPERF_OUTPUT = _caps_output.gperf - --all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME) -+all: $(STACAPLIBNAME) pcs $(STAPSXLIBNAME) - - pcs: libcap.pc libpsx.pc - -@@ -93,7 +93,7 @@ cap_test: cap_test.c libcap.h - test: cap_test - ./cap_test - --install: install-static install-shared -+install: install-static - - install-static: install-static-cap install-static-psx - From 394315def1def20193e583342bb1663f6fd47922 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 8 Apr 2021 05:59:56 +0000 Subject: [PATCH 69/89] x264: fix static build --- pkgs/development/libraries/x264/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 93d0b42a889..ede8e1e317b 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, nasm }: +{ stdenv, lib, fetchurl, nasm +, enableShared ? !stdenv.hostPlatform.isStatic + }: stdenv.mkDerivation rec { pname = "x264"; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { export AS=$CC ''; - configureFlags = [ "--enable-shared" ] + configureFlags = lib.optional enableShared [ "--enable-shared" ] ++ lib.optional (!stdenv.isi686) "--enable-pic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; From b9fcaefeb36f2efa1c157f4bd4e947ab54343248 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 6 Apr 2021 19:19:28 +0200 Subject: [PATCH 70/89] hdf5_1_10: init at 1.10.7 Introduce hdf5_1_10 so it can be used by packages encountering issues hdf5 1.12.0. --- pkgs/tools/misc/hdf5/1.10.nix | 50 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/misc/hdf5/1.10.nix diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix new file mode 100644 index 00000000000..1a972daf610 --- /dev/null +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, fetchurl +, removeReferencesTo +, zlib ? null +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +let inherit (lib) optional optionals; in + +stdenv.mkDerivation rec { + version = "1.10.7"; + pname = "hdf5"; + src = fetchurl { + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2"; + sha256 = "0pm5xxry55i0h7wmvc7svzdaa90rnk7h78rrjmnlkz2ygsn8y082"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ removeReferencesTo ]; + + propagatedBuildInputs = optional (zlib != null) zlib; + + configureFlags = optional enableShared "--enable-shared"; + + patches = [ + ./bin-mv.patch + ]; + + postInstall = '' + find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + + moveToOutput 'bin/h5cc' "''${!outputDev}" + moveToOutput 'bin/h5c++' "''${!outputDev}" + moveToOutput 'bin/h5fc' "''${!outputDev}" + moveToOutput 'bin/h5pcc' "''${!outputDev}" + ''; + + meta = { + description = "Data model, library, and file format for storing and managing data"; + longDescription = '' + HDF5 supports an unlimited variety of datatypes, and is designed for flexible and efficient + I/O and for high volume and complex data. HDF5 is portable and is extensible, allowing + applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and + applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. + ''; + license = lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant + homepage = "https://www.hdfgroup.org/HDF5/"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c4c579a754..17614ba226f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5314,6 +5314,8 @@ in szip = null; }; + hdf5_1_10 = callPackage ../tools/misc/hdf5/1.10.nix { }; + hdf5-mpi = appendToName "mpi" (hdf5.override { szip = null; mpiSupport = true; From 50d604314e736d24dc7aa6749b5482c859147b17 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 6 Apr 2021 19:21:07 +0200 Subject: [PATCH 71/89] python3Packages.tables: use hdf5_1_10 instead of hdf5 Without that, the test suite of python3Packages.pandas segfault. --- pkgs/top-level/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef0bc05ebaa..0ee6db02a76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8128,9 +8128,13 @@ in { tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; tables = if isPy3k then - callPackage ../development/python-modules/tables { } + callPackage ../development/python-modules/tables { + hdf5 = pkgs.hdf5_1_10; + } else - callPackage ../development/python-modules/tables/3.5.nix { }; + callPackage ../development/python-modules/tables/3.5.nix { + hdf5 = pkgs.hdf5_1_10; + }; tablib = callPackage ../development/python-modules/tablib { }; From e0213764e787c856f8b542b69c4dba2e76977f86 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Thu, 8 Apr 2021 08:44:35 +0200 Subject: [PATCH 72/89] cue: 0.2.2 -> 0.3.0 --- pkgs/development/tools/cue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 28660732ea4..c974286ab99 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cue"; - version = "0.2.2"; + version = "0.3.0"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "1crl5fldczc3jkwf7gvwvghckr6gfinfslzca4ps1098lbq83zcq"; + sha256 = "1h3809xgmn7dr57i3cnifr7r555i3zh3kfsv0gxa9nd7068w19xm"; }; - vendorSha256 = "0l6slaji9nh16jqp1nvib95h2db1xyjh6knk5hj2zaa1rks4b092"; + vendorSha256 = "10kvss23a8a6q26a7h1bqc3i0nskm2halsvc9wdv9zf9qsz7zjkp"; doCheck = false; From 2bc413b97069263e64ec0ce50029e5266497e527 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Thu, 8 Apr 2021 09:24:12 +0200 Subject: [PATCH 73/89] gradle: Add 7-rc-2, leave latest pointing at 6.8 (#117462) --- .../tools/build-managers/gradle/default.nix | 54 ++++++++++--------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index b27d75b7801..993bd668463 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,6 +1,15 @@ { lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: -rec { +let + gradleSpec = { version, nativeVersion, sha256 }: rec { + inherit nativeVersion; + name = "gradle-${version}"; + src = fetchurl { + inherit sha256; + url = "https://services.gradle.org/distributions/${name}-bin.zip"; + }; + }; +in rec { gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation { inherit name src nativeVersion; @@ -52,35 +61,30 @@ rec { }; }; + # NOTE: Gradle 7 is a release candidate, so point to 6.8. gradle_latest = gradle_6_8; - gradle_6_8 = gradleGen rec { - name = "gradle-6.8.3"; + gradle_7 = gradleGen (gradleSpec { + version = "7.0-rc-2"; + nativeVersion = "0.22-milestone-11"; + sha256 = "0gzvigyvwwizx90vnzhdnbm5rdaki11inxna11s4y67xkn8hrnx5"; + }); + + gradle_6_8 = gradleGen (gradleSpec { + version = "6.8.3"; nativeVersion = "0.22-milestone-9"; + sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz"; + }); - src = fetchurl { - url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz"; - }; - }; - - gradle_5_6 = gradleGen rec { - name = "gradle-5.6.4"; + gradle_5_6 = gradleGen (gradleSpec { + version = "5.6.4"; nativeVersion = "0.18"; + sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d"; + }); - src = fetchurl { - url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d"; - }; - }; - - gradle_4_10 = gradleGen rec { - name = "gradle-4.10.3"; + gradle_4_10 = gradleGen (gradleSpec { + version = "4.10.3"; nativeVersion = "0.14"; - - src = fetchurl { - url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; - }; - }; + sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; + }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe2eed5198e..c34954de45f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12773,6 +12773,7 @@ in gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; gradle_6 = res.gradleGen.gradle_6_8; + gradle_7 = res.gradleGen.gradle_7; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. From aeb4a2b5e6fccea6f8a82c76325f0f06c11a26fc Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 8 Apr 2021 08:43:43 +0100 Subject: [PATCH 74/89] kube3d: correct the k3sVersion to be inline with upstream --- pkgs/applications/networking/cluster/kube3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 9616d59b69f..d0aa1029d63 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.4-k3s1" }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.5-k3s1" }: buildGoModule rec { pname = "kube3d"; From 26ab16721887883a3d0130e002d944e6ad6237b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Apr 2021 09:49:33 +0200 Subject: [PATCH 75/89] python3Packages.xknx: 0.17.5 -> 0.18.0 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 8ad4df26208..a181a674188 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.17.5"; + version = "0.18.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-oLm1Bh58mKwbQf9FloqEnypzANikxgdFpAB99h/Mb9U="; + sha256 = "sha256-8g8DrFvhecdPsfiw+uKnfJOrLQeuFUziK2Jl3xKmrf4="; }; propagatedBuildInputs = [ From a20d26806ffea6bc20e7d05270cac0dc3cb37c18 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Apr 2021 02:55:51 -0500 Subject: [PATCH 76/89] python38Packages.internetarchive: 1.9.9 -> 2.0.2 (#118779) Co-authored-by: Fabian Affolter --- .../development/python-modules/internetarchive/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index ca91ad954a4..0d1fb08e2a4 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "1.9.9"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "a1614cbf35499d833e07699ddfd344764f86959fd5535aa9ce1203f57a77f970"; + sha256 = "515e6646a2b917c15f2241670d21f14a014b9c67dc509aef4d4aca5a59cdda65"; }; propagatedBuildInputs = [ @@ -52,7 +52,8 @@ buildPythonPackage rec { meta = with lib; { description = "A Python and Command-Line Interface to Archive.org"; homepage = "https://github.com/jjjake/internetarchive"; - license = licenses.agpl3; + changelog = "https://github.com/jjjake/internetarchive/raw/v${version}/HISTORY.rst"; + license = licenses.agpl3Plus; maintainers = [ maintainers.marsam ]; }; } From 35aca2bada671d7ccfb7c9a37c5b59563e5cc680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 8 Apr 2021 09:54:56 +0200 Subject: [PATCH 77/89] gitlab: add back GITLAB_WORKHORSE_VERSION https://github.com/NixOS/nixpkgs/commit/9b30cda2f6e301abc6f39e01902330d981b12a80#r49247855 --- pkgs/applications/version-management/gitlab/data.json | 3 ++- pkgs/applications/version-management/gitlab/update.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index bd07773f0de..aa5338ea7c6 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -7,6 +7,7 @@ "passthru": { "GITALY_SERVER_VERSION": "13.10.2", "GITLAB_PAGES_VERSION": "1.36.0", - "GITLAB_SHELL_VERSION": "13.17.0" + "GITLAB_SHELL_VERSION": "13.17.0", + "GITLAB_WORKHORSE_VERSION": "13.10.2" } } diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index b84846c88ab..993dad08ec6 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -69,6 +69,9 @@ class GitLabRepo: passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION', 'GITLAB_SHELL_VERSION']} + + passthru["GITLAB_WORKHORSE_VERSION"] = version + return dict(version=self.rev2version(rev), repo_hash=self.get_git_hash(rev), owner=self.owner, @@ -186,7 +189,7 @@ def update_gitlab_shell(): def update_gitlab_workhorse(): """Update gitlab-workhorse""" data = _get_data_json() - gitlab_workhorse_version = data['version'] + gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION'] _call_nix_update('gitlab-workhorse', gitlab_workhorse_version) From 3d19bc0352e60b098000835ce6abeaafbb779315 Mon Sep 17 00:00:00 2001 From: Jason O'Conal Date: Thu, 8 Apr 2021 17:28:06 +0930 Subject: [PATCH 78/89] plex: 1.22.1.4275 -> 1.22.2.4284 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 4ffd8f5c039..68168618c55 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.22.1.4275-48e10484b"; + version = "1.22.2.4282-a97b03fad"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "08x5ay0nvsdc2n584bw0vdqxh33wn0mlwyqciwgvwq873jn39j3z"; + sha256 = "01krx6vhk24wm2hikxkfv8m53y8b4yqnkii4j9zf48f1a9hlj2zp"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1h5pkd7fzqlbvqv25cdppglw651yc3026hnyim5vy1s1s182paws"; + sha256 = "04wzv15pnd4sn6cy62m8prvsxpxj4sg3q9ahwsrn2cj31vgayg0i"; }; outputs = [ "out" "basedb" ]; From 004584d3b624fcf18cf47ac32e3d479fbcfe0bb0 Mon Sep 17 00:00:00 2001 From: kraem Date: Thu, 8 Apr 2021 10:00:47 +0200 Subject: [PATCH 79/89] go_1_15: 1.15.10 -> 1.15.11 --- pkgs/development/compilers/go/1.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index d44f28f8929..7f7870b7e06 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -11,7 +11,7 @@ let inherit (lib) optionals optionalString; - version = "1.15.10"; + version = "1.15.11"; go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0rfx20y13cflv68nn8jci1fx34vfdn7qgyavm5hivd0h15pcmny1"; + sha256 = "1rb1s130yqy80kcl140k5a53xhvw4fmrpmclvqygcv67si0j8nzj"; }; # perl is used for testing go vet From 82f9b63f70825133412559874cbc14debb449f03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Apr 2021 10:13:01 +0200 Subject: [PATCH 80/89] python3Packages.pysmappee: 0.2.18 -> 0.2.23 --- pkgs/development/python-modules/pysmappee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix index 626f55fc92a..a3517ea87ec 100644 --- a/pkgs/development/python-modules/pysmappee/default.nix +++ b/pkgs/development/python-modules/pysmappee/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pysmappee"; - version = "0.2.18"; + version = "0.2.23"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "smappee"; repo = pname; rev = version; - sha256 = "sha256-DnRtKr8aGZ6rcN/wTpcFNaI+EJm07nObfWyBpLkQF38="; + sha256 = "sha256-vxCZzkngYnc+hD3gT1x7qAQTFjpmmgRU5F6cusNDNgk="; }; propagatedBuildInputs = [ From ff5ff66ef3c0107bd586f3521a9453e2bb4c84d8 Mon Sep 17 00:00:00 2001 From: zseri Date: Thu, 25 Mar 2021 16:52:17 +0100 Subject: [PATCH 81/89] build-rust-crate: disable incremental builds --- .../rust/build-rust-crate/build-crate.nix | 14 ++++++++------ .../rust/build-rust-crate/configure-crate.nix | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 84d1b2300f1..df3129d536d 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -9,12 +9,14 @@ let baseRustcOpts = - [(if release then "-C opt-level=3" else "-C debuginfo=2")] - ++ ["-C codegen-units=$NIX_BUILD_CORES"] - ++ ["--remap-path-prefix=$NIX_BUILD_TOP=/" ] - ++ [(mkRustcDepArgs dependencies crateRenames)] - ++ [(mkRustcFeatureArgs crateFeatures)] - ++ extraRustcOpts + [ + (if release then "-C opt-level=3" else "-C debuginfo=2") + "-C codegen-units=$NIX_BUILD_CORES" + "-C incremental=no" + "--remap-path-prefix=$NIX_BUILD_TOP=/" + (mkRustcDepArgs dependencies crateRenames) + (mkRustcFeatureArgs crateFeatures) + ] ++ extraRustcOpts ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTargetSpec stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022 diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index d1010ac1adb..3eaba1736fc 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -24,7 +24,7 @@ let version_ = lib.splitString "-" crateVersion; version = lib.splitVersion (lib.head version_); rustcOpts = lib.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") - (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); + (["-C codegen-units=$NIX_BUILD_CORES -C incremental=no"] ++ extraRustcOpts); buildDeps = mkRustcDepArgs buildDependencies crateRenames; authors = lib.concatStringsSep ":" crateAuthors; optLevel = if release then 3 else 0; From 81829ece77562babea4a3244232213a3d5a3bdcb Mon Sep 17 00:00:00 2001 From: Karol Chmist Date: Thu, 8 Apr 2021 10:44:45 +0200 Subject: [PATCH 82/89] devilutionx: unstable-2020-10-20 -> 1.2.0 --- pkgs/games/devilutionx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index af036696c04..0f89bdeabb4 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: stdenv.mkDerivation rec { pname = "devilutionx"; - version = "unstable-2020-10-20"; + version = "1.2.0"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; - rev = "432fbc8ef7b98e567b08e44ce91b198374a5ff01"; + rev = version; sha256 = "03w3bgmzwsbycx3fzvn47fsmabl069gw77yn2fqg89wlgaw1yrr9"; }; From 9741a4b3b489487939b34bc7a13c116b5793a714 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 8 Apr 2021 09:09:32 +0000 Subject: [PATCH 83/89] x264: flatten configureFlags (#118789) --- pkgs/development/libraries/x264/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index ede8e1e317b..5b82c594b08 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { export AS=$CC ''; - configureFlags = lib.optional enableShared [ "--enable-shared" ] + configureFlags = lib.optional enableShared "--enable-shared" ++ lib.optional (!stdenv.isi686) "--enable-pic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; From 21ef17ec4444862c1332b05651527ea9720eaaf8 Mon Sep 17 00:00:00 2001 From: Riey Date: Thu, 8 Apr 2021 18:32:12 +0900 Subject: [PATCH 84/89] maintainers: add riey --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 047372b63aa..e4264fbd308 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8167,6 +8167,12 @@ githubId = 16779; name = "Rickard Nilsson"; }; + riey = { + email = "creeper844@gmail.com"; + github = "Riey"; + githubId = 14910534; + name = "Riey"; + }; rika = { email = "rika@paymentswit.ch"; github = "NekomimiScience"; From 6bf4e6b230de1c1823cf36fdf00a243633d8f4cf Mon Sep 17 00:00:00 2001 From: Riey Date: Thu, 8 Apr 2021 18:32:24 +0900 Subject: [PATCH 85/89] cargo-feature: init at 0.5.2 --- .../tools/rust/cargo-feature/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-feature/default.nix diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/development/tools/rust/cargo-feature/default.nix new file mode 100644 index 00000000000..94b5000b9b6 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-feature/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-feature"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "Riey"; + repo = pname; + rev = "v${version}"; + sha256 = "0n5kzh756ghfs3cydlcn9mfvpgwy1cjg41h0nd9dbi5cr1fp9x1n"; + }; + + cargoSha256 = "0nvl5smibl81b826xcsrjx8p89lcfpj7wqdsvywnj7jd3p5ag03n"; + + meta = with lib; { + description = "Allows conveniently modify features of crate"; + homepage = "https://github.com/Riey/cargo-feature"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ riey ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30ed4770905..a3f0233b30c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11240,6 +11240,7 @@ in }; cargo-embed = callPackage ../development/tools/rust/cargo-embed { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; + cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-flash = callPackage ../development/tools/rust/cargo-flash { }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; From 9decc936e3f068896659aa7e45f85eab6b93d646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 8 Apr 2021 11:40:54 +0200 Subject: [PATCH 86/89] topgrade: 6.7.0 -> 6.8.0 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index c6021c0599b..ff0661de46a 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.7.0"; + version = "6.8.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UikJZFSnkYGGGMm6hrOqs+ax9HwUsZPht9wV79rJBgE="; + sha256 = "sha256-PPOsb9bne0q/WGAL3W2RGo/0yxyz/XXU3xYXKcCIqX0="; }; - cargoSha256 = "sha256-8MvXpJVwiIThwq8Du/9nQ0QINpqgemwiRpunzIUqkXk="; + cargoSha256 = "sha256-IirU/4hE+jo5A9pB7RnePhqcbCZXBCe0Ki6i7eEWIbk="; buildInputs = lib.optional stdenv.isDarwin Foundation; From 2fca2fcb229760544538b4d76e645d1a848fe5cd Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 8 Apr 2021 12:12:59 +0200 Subject: [PATCH 87/89] teleport: wrap tsh with xdg-utils --- pkgs/servers/teleport/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 8650ff108eb..8c6caab8f62 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ lib, buildGoPackage, zip, fetchFromGitHub }: +{ lib, buildGoPackage, zip, fetchFromGitHub, makeWrapper, xdg-utils }: let webassets = fetchFromGitHub { owner = "gravitational"; @@ -25,7 +25,7 @@ buildGoPackage rec { subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; - nativeBuildInputs = [ zip ]; + nativeBuildInputs = [ zip makeWrapper ]; postBuild = '' pushd . @@ -48,6 +48,7 @@ buildGoPackage rec { postInstall = '' install -Dm755 -t $client/bin $out/bin/tsh + wrapProgram $out/bin/tsh --prefix PATH : ${xdg-utils}/bin ''; doInstallCheck = true; From db3e568d98e8cb42a0e298263d42895d48c55025 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 8 Apr 2021 12:20:46 +0200 Subject: [PATCH 88/89] teleport: 5.1.2 -> 5.2.1 --- pkgs/servers/teleport/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 8c6caab8f62..2350311b9db 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -4,21 +4,21 @@ let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - rev = "2d79788dbcd005bdcfe5b5120007d0faf8f1fc82"; - sha256 = "001a3bx8yyx1hq8y5yiy1jzp122q8gcl369lj0609gaxp6dk5bdw"; + rev = "8ace0cfcc6867651bed3fd5b5f35aaa2a80e1106"; + sha256 = "sha256-mzvYysCFMvWHo8Y4cmhAju62jjpe92j564gc12BSdZA="; }; in buildGoPackage rec { pname = "teleport"; - version = "5.1.2"; + version = "5.2.1"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "0h1hn2dpdsmhxac06gn6787z2mnfcwb3wn0c2l7l2qhw6iqpgmvh"; + sha256 = "sha256-8WEVH+04y1/s9KpBlK/LrgHG7qTpu2LqtanKKdi9N08="; }; goPackagePath = "github.com/gravitational/teleport"; From 5db7e33f1d642852764ce0f756b98cff09cad23f Mon Sep 17 00:00:00 2001 From: austinbutler Date: Thu, 8 Apr 2021 04:10:16 -0700 Subject: [PATCH 89/89] python3Packages.awslambdaric: init at 1.0.0 (#118771) Co-authored-by: Sandro --- .../python-modules/awslambdaric/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/awslambdaric/default.nix diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix new file mode 100644 index 00000000000..ff26bb6245d --- /dev/null +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytestCheckHook, autoconf +, automake, cmake, gcc, libtool, perl, simplejson }: + +buildPythonPackage rec { + pname = "awslambdaric"; + version = "1.0.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-lambda-python-runtime-interface-client"; + rev = "v${version}"; + sha256 = "13v1lsp3lxbqknvlb3gvljjf3wyrx5jg8sf9yfiaj1sm8pb8pmrf"; + }; + + propagatedBuildInputs = [ simplejson ]; + + nativeBuildInputs = [ autoconf automake cmake libtool perl ]; + + buildInputs = [ gcc ]; + + dontUseCmakeConfigure = true; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "awslambdaric" "runtime_client" ]; + + meta = with lib; { + description = "AWS Lambda Runtime Interface Client for Python"; + homepage = "https://github.com/aws/aws-lambda-python-runtime-interface-client"; + license = licenses.asl20; + maintainers = with maintainers; [ austinbutler ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00d1934a070..7489fc23438 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -652,6 +652,8 @@ in { awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { }; + awslambdaric = callPackage ../development/python-modules/awslambdaric { }; + axis = callPackage ../development/python-modules/axis { }; azure-appconfiguration = callPackage ../development/python-modules/azure-appconfiguration { };