From caf6e184f978e3e9d07f24ffd709ce90f0667f27 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Wed, 31 Mar 2021 19:41:09 -0400 Subject: [PATCH 01/75] num-utils: init at 0.5 --- pkgs/tools/text/num-utils/default.nix | 29 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/text/num-utils/default.nix diff --git a/pkgs/tools/text/num-utils/default.nix b/pkgs/tools/text/num-utils/default.nix new file mode 100644 index 000000000000..14784a4e8cfc --- /dev/null +++ b/pkgs/tools/text/num-utils/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "num-utils"; + version = "0.5"; + + src = fetchurl { + url = "https://suso.suso.org/programs/num-utils/downloads/num-utils-${version}.tar.gz"; + sha256 = "0kn6yskjww2agcqvas5l2xp55mp4njdxqkdicchlji3qzih2fn83"; + }; + + buildInputs = [ perl ]; + + patchPhase = '' + substituteInPlace Makefile --replace "-o 0 -g 0" "" --replace "\$(RPMDIR)" "" + ''; + makeFlags = [ + "TOPDIR=${placeholder "out"}" + "PERL=${perl}/bin/perl" + ]; + + meta = with lib; { + description = "Programs for dealing with numbers from the command line"; + homepage = "https://suso.suso.org/xulu/Num-utils"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.catern ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b3c21569870..7f94306060b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2656,6 +2656,8 @@ in numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { }; + num-utils = callPackage ../tools/text/num-utils { }; + iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; From 15c278930ced7e4d95a2d14dadc5a1f7d4527b7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 May 2021 05:44:59 +0000 Subject: [PATCH 02/75] elan: 1.0.2 -> 1.0.6 --- pkgs/applications/science/logic/elan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index d20be86daf0b..a49262e7cb65 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -7,16 +7,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.0.2"; + version = "1.0.6"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-nK4wvxK5Ne1+4kaMts6pIr5FvXBgXJsGdn68gGEZUdk="; + sha256 = "sha256-Ns8vSS/PDlfopigW4Nz3fdR9PCMG8gDoL36+/s0Qkeo="; }; - cargoSha256 = "sha256-ptSbpq1ePNWmdBGfKtqFGfkdimDjU0YEo4F8VPtQMt4="; + cargoSha256 = "sha256-NDtldiVo4SyE88f6ntKn1WJDFdvwN5Ps4DxQH15iNZE="; nativeBuildInputs = [ pkg-config makeWrapper ]; From 6f79f4c828fa9f8972bec17a8c2218a6166fb9d6 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 7 Jun 2021 21:39:26 +0200 Subject: [PATCH 03/75] pango: support cross-compilation by disabling docs and introspection --- pkgs/development/libraries/pango/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index f4dba00d3518..cfd0ff23259c 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -19,11 +19,15 @@ , x11Support? !stdenv.isDarwin, libXft }: +let + withDocs = stdenv.buildPlatform == stdenv.hostPlatform; +in stdenv.mkDerivation rec { pname = "pango"; version = "1.48.4"; - outputs = [ "bin" "out" "dev" "devdoc" ]; + outputs = [ "bin" "out" "dev" ] + ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -58,9 +62,11 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Dgtk_doc=${lib.boolToString withDocs}" ] ++ lib.optionals (!x11Support) [ "-Dxft=disabled" # only works with x11 + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; # Fontconfig error: Cannot load default config file @@ -70,7 +76,7 @@ stdenv.mkDerivation rec { doCheck = false; # test-font: FAIL - postInstall = '' + postInstall = lib.optionalString withDocs '' # So that devhelp can find this. # https://gitlab.gnome.org/GNOME/pango/merge_requests/293/diffs#note_1058448 mkdir -p "$devdoc/share/devhelp" From 874dc9e411cb05874533e3190d8ab4d14bd9f0da Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 18 Jun 2021 10:18:11 +0000 Subject: [PATCH 04/75] =?UTF-8?q?grafanaPlugins.grafana-polystat-panel:=20?= =?UTF-8?q?1.2.3=20=E2=86=92=201.2.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grafana/plugins/grafana-polystat-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index 07694688c4a8..254442b43d62 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-polystat-panel"; - version = "1.2.3"; - zipHash = "sha256-Eu3dTPfJxAWwqqGT6l4El4MqviBbzERarU30OXU+eEM="; + version = "1.2.4"; + zipHash = "sha256-gXPnblLrhxUTAqVFOnzaMXyOAnUBbONTqWJXozbnD0M="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; From ba15b39851fc8b7e35991c7be329140863eb07f7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 25 Jun 2021 09:08:10 +0300 Subject: [PATCH 05/75] apt-offline: 1.8.1 -> unstable-2021-04-11 --- pkgs/tools/misc/apt-offline/default.nix | 29 ++++++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 9c952cc7c302..3dc3fa1bbe24 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,22 +1,39 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages, unstableGitUpdater, gnupg }: python3Packages.buildPythonApplication rec { - version = "1.8.1"; pname = "apt-offline"; + version = "unstable-2021-04-11"; src = fetchFromGitHub { owner = "rickysarraf"; repo = pname; - rev = "v${version}"; - sha256 = "0k79d1d8jiwg1s684r05njmk1dz8gsb8a9bl4agz7m31snc11j84"; + rev = "4e4b3281d004d1ece4833b7680e2b5b091402a03"; + sha256 = "1lk4186h2wc8fphd592rhq7yj4kgc7jjawx4pjrs6pg4n0q32pl6"; }; + postPatch = '' + substituteInPlace org.debian.apt.aptoffline.policy \ + --replace /usr/bin/ "$out/bin" + + substituteInPlace apt_offline_core/AptOfflineCoreLib.py \ + --replace /usr/bin/gpgv "${gnupg}/bin/gpgv" + ''; + + preFixup = '' + rm "$out/bin/apt-offline-gui" + rm "$out/bin/apt-offline-gui-pkexec" + ''; + doCheck = false; - # Requires python-qt4 (feel free to get it working). - preFixup = ''rm "$out/bin/apt-offline-gui"''; + pythonimportsCheck = [ "apt-offline" ]; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/rickysarraf/apt-offline.git"; + }; meta = with lib; { + homepage = "https://github.com/rickysarraf/apt-offline"; description = "Offline APT package manager"; license = licenses.gpl3; maintainers = [ ]; From f7b2b34908d68db628e0a6925c463e620fb67693 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jun 2021 14:25:19 +0000 Subject: [PATCH 06/75] fluxctl: 1.22.2 -> 1.23.0 --- pkgs/applications/networking/cluster/fluxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index fadaa94995cb..bba0b74172a9 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.22.2"; + version = "1.23.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-qYdVplNHyD31m4IbIeL3x3nauZLl1XquslS3WrtUXBk="; + sha256 = "sha256-CJY7XjHJ6suJrjhnG+w5oM1FtVnegcbkCVGjyoBtBag="; }; - vendorSha256 = "sha256-4uSw/9lI/rdDqy78jNC9eHYW/v/sMFb+sQvwYG6GZks="; + vendorSha256 = "sha256-aC6E+PpuUqFhZKvQT5AuxpPmHfhjCwHzwFHDzk5wazw="; nativeBuildInputs = [ installShellFiles ]; From 5bc45b51d03dbb8a00024acdba9145d011e51067 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 27 Jun 2021 10:18:02 +0000 Subject: [PATCH 07/75] =?UTF-8?q?grafanaPlugins.grafana-polystat-panel:=20?= =?UTF-8?q?1.2.4=20=E2=86=92=201.2.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grafana/plugins/grafana-polystat-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index 254442b43d62..85b4c7069a9a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-polystat-panel"; - version = "1.2.4"; - zipHash = "sha256-gXPnblLrhxUTAqVFOnzaMXyOAnUBbONTqWJXozbnD0M="; + version = "1.2.5"; + zipHash = "sha256-U9vNfK4ofNzwL7MVe43tGY85gI56Jt1eb7TrCkeNrOQ="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; From 851848fcbce25fc07d7bde2d7d848b2b00501571 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Sat, 26 Jun 2021 18:16:03 +0800 Subject: [PATCH 08/75] rime-data: init at 0.38.20210628 --- pkgs/data/misc/rime-data/default.nix | 66 +++++++++ pkgs/data/misc/rime-data/fetchSchema.nix | 137 ++++++++++++++++++ .../misc/rime-data/generateFetchSchema.sh | 43 ++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 248 insertions(+) create mode 100644 pkgs/data/misc/rime-data/default.nix create mode 100644 pkgs/data/misc/rime-data/fetchSchema.nix create mode 100755 pkgs/data/misc/rime-data/generateFetchSchema.sh diff --git a/pkgs/data/misc/rime-data/default.nix b/pkgs/data/misc/rime-data/default.nix new file mode 100644 index 000000000000..371a07d3ec1a --- /dev/null +++ b/pkgs/data/misc/rime-data/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchFromGitHub, librime }: + +stdenv.mkDerivation { + pname = "rime-data"; + version = "0.38.20210628"; + + src = fetchFromGitHub { + owner = "rime"; + repo = "plum"; + rev = "0b835e347cad9c2d7038cfe82df5b5d1fe1c0327"; + sha256 = "0mja4wyazxdc6fr7pzij5ah4rzwxv4s12s64vfn5ikx1ias1f8ib"; + }; + + buildInputs = [ librime ]; + + buildFlags = [ "all" ]; + makeFlags = [ "PREFIX=$(out)" ]; + + preBuild = import ./fetchSchema.nix fetchFromGitHub; + + postPatch = '' + # Disable git operations. + sed -i /fetch_or_update_package$/d scripts/install-packages.sh + ''; + + meta = with lib; { + description = "Schema data of Rime Input Method Engine"; + longDescription = '' + Rime-data provides schema data for Rime Input Method Engine. + ''; + homepage = "https://rime.im"; + license = with licenses; [ + # rime-array + # rime-combo-pinyin + # rime-double-pinyin + # rime-middle-chinese + # rime-scj + # rime-soutzoe + # rime-stenotype + # rime-wugniu + gpl3Only + + # plum + # rime-bopomofo + # rime-cangjie + # rime-emoji + # rime-essay + # rime-ipa + # rime-jyutping + # rime-luna-pinyin + # rime-prelude + # rime-quick + # rime-stroke + # rime-terra-pinyin + # rime-wubi + lgpl3Only + + # rime-pinyin-simp + asl20 + + # rime-cantonese + cc-by-40 + ]; + maintainers = [ maintainers.pengmeiyu ]; + }; +} diff --git a/pkgs/data/misc/rime-data/fetchSchema.nix b/pkgs/data/misc/rime-data/fetchSchema.nix new file mode 100644 index 000000000000..7bf7d8477c5e --- /dev/null +++ b/pkgs/data/misc/rime-data/fetchSchema.nix @@ -0,0 +1,137 @@ +# Generated using generateFetchSchema.sh +fetchFromGitHub: +'' +mkdir -p package/rime +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-array"; + rev = "8514193da939bc8888ad6a744f5e5921d4baebc7"; + sha256 = "1fy7pcq7d8m0wzkkhklmv6p370ms9lqc1zpndyy2xjamzrbb9l83"; +}} package/rime/array +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-bopomofo"; + rev = "c7618f4f5728e1634417e9d02ea50d82b71956ab"; + sha256 = "0g77nv0jrwqnbqqna0ib0kqcy6l5zl62kh49ny67d6bjwnwz9186"; +}} package/rime/bopomofo +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-cangjie"; + rev = "8dfad9e537f18821b71ba28773315d9c670ae245"; + sha256 = "029kw9nx6x0acg4f0m8wj1ziqffffhy9yyj51nlx17cnia0qcrby"; +}} package/rime/cangjie +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-cantonese"; + rev = "b6f800c74eb639816d56d0d5601aaa96c8963178"; + sha256 = "1a4ksacbz8l30y3y5c017d0hzwik8knplglb3yswy7l4hsvaanyh"; +}} package/rime/cantonese +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-combo-pinyin"; + rev = "a84065a86b272c76215215bd6f03c506b6e7097c"; + sha256 = "1f0b4kakw0x26gmx7xi4f94nbjlb8lvi9bks4f92jswa045vnd87"; +}} package/rime/combo-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-double-pinyin"; + rev = "69bf85d4dfe8bac139c36abbd68d530b8b6622ea"; + sha256 = "093wif5avvvw45fqbwj5wkbxrychy4pagl4mwsmbrayc8jkp69ak"; +}} package/rime/double-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-emoji"; + rev = "4c8c51f4a3bc7298c99376eda9bbd86070fc4fa1"; + sha256 = "0175jqh210fncafqckr9zzaw55qpswmqjrykwms1apmc68l43122"; +}} package/rime/emoji +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-essay"; + rev = "9db2e77305e75798baf3ec8dcf1f82785b5e1be9"; + sha256 = "03ypkkaadd5qmyg26n24a66cll90xvcimgbmiyv4d33jradiqg22"; +}} package/rime/essay +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-ipa"; + rev = "22b71710e029bcb412e9197192a638ab11bc2abf"; + sha256 = "0zdk4f9qkfj3q5hmjnairj1lv6f6y27mic12k886n6sxywwbwr2k"; +}} package/rime/ipa +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-jyutping"; + rev = "1e24baa6998815c716c581effe8ec65ee87c4e8c"; + sha256 = "0s2rckpwlrm3n7w1csnqyi5p9mkpp3z87s7mrm2vc9sv06rpv7zl"; +}} package/rime/jyutping +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-luna-pinyin"; + rev = "623adb022b094d540218b287c2e601509eee3347"; + sha256 = "06pcwp09l5wkqv7792gbsl31xnlb3gr9q6bgbp94vvq6m2ycahqz"; +}} package/rime/luna-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-middle-chinese"; + rev = "9fad7a7c0c26167d5e6e85db8df48a15c7f7d4f0"; + sha256 = "0a0bqrlzg0k692xblqnh1rh1fwwqqb205xwxlihgji85n8ibcgph"; +}} package/rime/middle-chinese +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-pinyin-simp"; + rev = "b0e84cda02c613ebdedc127a26131b3800f45a8e"; + sha256 = "05v804qr3a9xvjzp9yid7231fi2l2yrl47ybbvql61z9k36ab094"; +}} package/rime/pinyin-simp +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-prelude"; + rev = "3de303ffaa731dba07b0462ce59f4767e1219ad2"; + sha256 = "0g7a0bla58rh1v3md59k6adk185pilb4z8i2i0pqdl4nwqp40n2p"; +}} package/rime/prelude +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-quick"; + rev = "3fe5911ba608cb2df1b6301b76ad1573bd482a76"; + sha256 = "08bh87ym5qvw55lyw20l3m7jd4c2z5rvil8h5q8790r7z6j6ijy9"; +}} package/rime/quick +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-scj"; + rev = "cab5a0858765eff0553dd685a2d61d5536e9149c"; + sha256 = "0ard2bjp4896a8dimmcwyjwgmp9kl4rz92yc92jnd3y4rgwl6fvk"; +}} package/rime/scj +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-soutzoe"; + rev = "beeaeca72d8e17dfd1e9af58680439e9012987dc"; + sha256 = "0jyqx0q9s0qxn168l5n8zav8jcl2g5ppr7pa8jm1vwrllf20slcc"; +}} package/rime/soutzoe +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-stenotype"; + rev = "f3e9189d5ce33c55d3936cc58e39d0c88b3f0c88"; + sha256 = "0dl6px7lrh3xa87knjzwzdcwjj1k1dg4l72q7lb48an4s9f1cy5d"; +}} package/rime/stenotype +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-stroke"; + rev = "ea8576d1accd6fda339e96b415caadb56e2a07d1"; + sha256 = "07h6nq9867hjrd2v3h1pnr940sdrw4mqrzj43siz1rzjxz3s904r"; +}} package/rime/stroke +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-terra-pinyin"; + rev = "ce7b9249612f575d2f43d51fcacd31d1b4e0ef1b"; + sha256 = "0vm303f4lrdmdmif5klrp6w29vn9z2vzw33cw0y83pcnz39wiads"; +}} package/rime/terra-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-wubi"; + rev = "f1876f08f1d4a9696395be0070c0e8e4353c44cb"; + sha256 = "1d9y9rqssacria9d0hla96czsqv2wkfm6z926m1x269ryv96zxvk"; +}} package/rime/wubi +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-wugniu"; + rev = "abd1ee98efbf170258fcf43875c21a4259e00b61"; + sha256 = "0qn54d3cclny106ixdw08r5n6wn52ffs1hgrma3k0j4pv0kr9nlq"; +}} package/rime/wugniu +'' diff --git a/pkgs/data/misc/rime-data/generateFetchSchema.sh b/pkgs/data/misc/rime-data/generateFetchSchema.sh new file mode 100755 index 000000000000..e7c05c410281 --- /dev/null +++ b/pkgs/data/misc/rime-data/generateFetchSchema.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-git -p jq + +imlist=( + array + bopomofo + cangjie + cantonese + combo-pinyin + double-pinyin + emoji + essay + ipa + jyutping + luna-pinyin + middle-chinese + pinyin-simp + prelude + quick + scj + soutzoe + stenotype + stroke + terra-pinyin + wubi + wugniu +) + +echo "# Generated using generateFetchSchema.sh" +echo "fetchFromGitHub:" +echo \'\' +echo "mkdir -p package/rime" +for im in ${imlist[@]}; do + tempFile=$(mktemp) + echo "ln -sv \${fetchFromGitHub {" + echo " owner = \"rime\";" + echo " repo = \"rime-$im\";" + nix-prefetch-git --quiet https://github.com/rime/rime-$im \ + | jq '{ rev: .rev, sha256: .sha256 }' \ + | jq -r 'to_entries | map(" \(.key) = \"\(.value)\";") | .[]' + echo "}} package/rime/$im" +done +echo \'\' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cb7d00ea09a..3f90c5dbb262 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22432,6 +22432,8 @@ in redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; + rime-data = callPackage ../data/misc/rime-data { }; + route159 = callPackage ../data/fonts/route159 { }; sampradaya = callPackage ../data/fonts/sampradaya { }; From 53f682ab15baff982b49e2976948e04525f04628 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Sat, 26 Jun 2021 18:17:27 +0800 Subject: [PATCH 09/75] ibus-engines.rime: 1.4.0 -> 1.5.0 --- .../ibus-engines/ibus-rime/default.nix | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix index d444d44f2337..af3fcbe4e2cc 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix @@ -1,36 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify -, librime, brise }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gdk-pixbuf +, glib +, ibus +, libnotify +, librime +, pkg-config +, rime-data +}: stdenv.mkDerivation rec { pname = "ibus-rime"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "rime"; repo = "ibus-rime"; rev = version; - sha256 = "0zbajz7i18vrqwdyclzywvsjg6qzaih64jhi3pkxp7mbw8jc5vhy"; + sha256 = "0gdxg6ia0i31jn3cvh1nrsjga1j31hf8a2zfgg8rzn25chrfr319"; }; - buildInputs = [ gdk-pixbuf glib ibus libnotify librime brise ]; + buildInputs = [ gdk-pixbuf glib ibus libnotify librime rime-data ]; nativeBuildInputs = [ cmake pkg-config ]; - makeFlags = [ "PREFIX=$(out)" ]; - dontUseCmakeConfigure = true; + cmakeFlags = [ "-DRIME_DATA_DIR=${rime-data}/share/rime-data" ]; prePatch = '' - substituteInPlace Makefile \ - --replace 'cmake' 'cmake -DRIME_DATA_DIR=${brise}/share/rime-data' - - substituteInPlace rime_config.h \ - --replace '/usr' $out - - substituteInPlace rime_config.h \ - --replace 'IBUS_RIME_SHARED_DATA_DIR IBUS_RIME_INSTALL_PREFIX' \ - 'IBUS_RIME_SHARED_DATA_DIR "${brise}"' - - substituteInPlace rime.xml \ - --replace '/usr' $out + substituteInPlace CMakeLists.txt \ + --replace 'DESTINATION "''${RIME_DATA_DIR}"' \ + 'DESTINATION "''${CMAKE_INSTALL_DATADIR}/rime-data"' ''; meta = with lib; { From 7046e687bc5001b40561003cb876bb6ab7820477 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Wed, 30 Jun 2021 00:47:50 -0400 Subject: [PATCH 10/75] piston-cli: add python3Packages.more-itertools as dep --- pkgs/tools/misc/piston-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index ec77007804b9..5e1ca0242bc6 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "qvDGVJcaMXUajdUQWl4W1dost8k0PsS9XX/o8uQrtfY="; }; - propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml ]; + propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml more-itertools ]; checkPhase = '' $out/bin/piston --help > /dev/null From ad67354d1dc761892afa1b94542cd15621bd1ccf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jun 2021 21:35:06 +0000 Subject: [PATCH 11/75] jenkins: 2.289.1 -> 2.289.2 --- .../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 415b22894cbe..a128db527dfd 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.289.1"; + version = "2.289.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1wkm1y2bj245b9i51vhns9qfxc6xm44hg60vhgmswndcy5pwrybh"; + sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf"; }; buildCommand = '' From c239f3d739ce5d34ee9821311604f772e5523912 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 1 Jul 2021 12:12:47 +0800 Subject: [PATCH 12/75] vieb: 5.2.0 -> 5.3.0 --- .../networking/browsers/vieb/default.nix | 4 +- .../networking/browsers/vieb/package.json | 12 +- .../networking/browsers/vieb/yarn.lock | 875 +++++++++--------- .../networking/browsers/vieb/yarn.nix | 512 +++++----- 4 files changed, 694 insertions(+), 709 deletions(-) diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 0eeb52311599..f97e8d8250e7 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-wLaOqjDxgjfv4+TJeLE0dkrhfdnNSjiDqtFcHTm8uG4="; + sha256 = "sha256-NKWqSnUO8SScEodHYSptRHwVNOa5C4M61ac85d+wYK0="; }; packageJSON = ./package.json; diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index e12d86356c26..1836efdb8ad2 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,7 +1,7 @@ { "name": "vieb", "productName": "Vieb", - "version": "5.2.0", + "version": "5.3.0", "description": "Vim Inspired Electron Browser", "main": "app/index.js", "scripts": { @@ -29,18 +29,18 @@ "license": "GPL-3.0-or-later", "devDependencies": { "archiver": "5.3.0", - "electron": "13.1.2", + "electron": "13.1.4", "electron-builder": "22.11.7", "eslint": "7.29.0", "eslint-plugin-compat": "3.9.0", "eslint-plugin-sort-keys-fix": "1.1.1", - "jest-environment-jsdom": "27.0.3", - "jest": "27.0.4" + "jest": "27.0.6", + "jest-environment-jsdom": "27.0.6" }, "dependencies": { "7zip-bin": "5.1.1", - "@cliqz/adblocker-electron": "1.22.1", - "@cliqz/adblocker-electron-preload": "1.22.1", + "@cliqz/adblocker-electron": "1.22.2", + "@cliqz/adblocker-electron-preload": "1.22.2", "is-svg": "4.3.1", "rimraf": "3.0.2" }, diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index af42526610d0..33e9604c06da 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -22,9 +22,9 @@ "@babel/highlight" "^7.14.5" "@babel/compat-data@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz#8ef4c18e58e801c5c95d3c1c0f2874a2680fadea" - integrity sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" + integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== "@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5": version "7.14.6" @@ -90,9 +90,9 @@ "@babel/types" "^7.14.5" "@babel/helper-member-expression-to-functions@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz#d5c70e4ad13b402c95156c7a53568f504e2fb7b8" - integrity sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970" + integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA== dependencies: "@babel/types" "^7.14.5" @@ -181,10 +181,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.7.2": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz#d85cc68ca3cac84eae384c06f032921f5227f4b2" - integrity sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.14.7", "@babel/parser@^7.7.2": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595" + integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -287,16 +287,16 @@ "@babel/types" "^7.14.5" "@babel/traverse@^7.1.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.7.2": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz#c111b0f58afab4fea3d3385a406f692748c59870" - integrity sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753" + integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ== dependencies: "@babel/code-frame" "^7.14.5" "@babel/generator" "^7.14.5" "@babel/helper-function-name" "^7.14.5" "@babel/helper-hoist-variables" "^7.14.5" "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.5" + "@babel/parser" "^7.14.7" "@babel/types" "^7.14.5" debug "^4.1.0" globals "^11.1.0" @@ -314,34 +314,27 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.22.1", "@cliqz/adblocker-content@^1.22.2": +"@cliqz/adblocker-content@^1.22.2": version "1.22.2" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.2.tgz#643849d5f08c167eb84a2e7e3f1f9fbc41a3889b" integrity sha512-EsV00IdW8sGujGnylOGR8dm401FdIfPRAjuevsRlZjgDE+hQKj6n5wwrZaylPIh994hWesg6bxWTmXpJ2Sy2QQ== dependencies: "@cliqz/adblocker-extended-selectors" "^1.22.2" -"@cliqz/adblocker-electron-preload@1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz#8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af" - integrity sha512-etkb6LNUaCViZ2Bg7Z0fwpKsdsrmHF6Qjqs5u7FcfS4fSZ2TgDv7Ir5PunUWd6MOUW7mapx5CdPIupnlVkiTLA== - dependencies: - "@cliqz/adblocker-content" "^1.22.1" - -"@cliqz/adblocker-electron-preload@^1.22.1": +"@cliqz/adblocker-electron-preload@1.22.2", "@cliqz/adblocker-electron-preload@^1.22.2": version "1.22.2" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.2.tgz#eea674767a60abe4e5f9ccb46188d33656f551d0" integrity sha512-4JSqNNYo4hXMoZjnyBVTd3z2yV2n5qeoNPk+WaeOFEF9uJXhqPR+Sz7scNB6nMYnRuSQfraeogtdaA4s0JkJWQ== dependencies: "@cliqz/adblocker-content" "^1.22.2" -"@cliqz/adblocker-electron@1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz#13fe6de4be0c3beb2851634b27ea1223d10ca92b" - integrity sha512-RZUog6ogMZnOx9Rz1LWIHE5MOWdDStfzkbfLpelka6PerRSKKltUvV4qwqM455eUMqHqPd27ZMM183+MQ85WpQ== +"@cliqz/adblocker-electron@1.22.2": + version "1.22.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.2.tgz#85af3b49f7f653e6fb0d008b6523e3b3ba0dd41e" + integrity sha512-uSQjbcv9/csjQOO0AgqK8AnqdpKseebPkwXozglU1uFVVnuSOTs/4RohL3yac9uMkJtfyAIhT3mnbw9Cf4o+gQ== dependencies: - "@cliqz/adblocker" "^1.22.1" - "@cliqz/adblocker-electron-preload" "^1.22.1" + "@cliqz/adblocker" "^1.22.2" + "@cliqz/adblocker-electron-preload" "^1.22.2" tldts-experimental "^5.6.21" "@cliqz/adblocker-extended-selectors@^1.22.2": @@ -349,7 +342,7 @@ resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.2.tgz#1cad3c1569b765d9e7f8672c85b2a7b1e8e9ee90" integrity sha512-/u4SmQ1wr7d80iGP705fZrfHjJUTf/1MyRXz5Wltt7i3OHvOCQEoST2mqNlfx0W/9gIWzxA7cFRLY0/aITmzTw== -"@cliqz/adblocker@^1.22.1": +"@cliqz/adblocker@^1.22.2": version "1.22.2" resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.2.tgz#99a14d56327734d3083a077d96fe7b91c236bf7a" integrity sha512-P+a8gYbRbQy38mYsr7932h2cnK/7AEuQrmCEfLTO1+abCr2v5RM2Qb+cCn/JVnQSeqnysebAIXoV+PUzrjfpiQ== @@ -429,94 +422,94 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.2.tgz#b8eeff8f21ac51d224c851e1729d2630c18631e6" - integrity sha512-/zYigssuHLImGeMAACkjI4VLAiiJznHgAl3xnFT19iWyct2LhrH3KXOjHRmxBGTkiPLZKKAJAgaPpiU9EZ9K+w== +"@jest/console@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.6.tgz#3eb72ea80897495c3d73dd97aab7f26770e2260f" + integrity sha512-fMlIBocSHPZ3JxgWiDNW/KPj6s+YRd0hicb33IrmelCcjXo/pXPwvuiKFmZz+XuqI/1u7nbUK10zSsWL/1aegg== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.0.2" - jest-util "^27.0.2" + jest-message-util "^27.0.6" + jest-util "^27.0.6" slash "^3.0.0" -"@jest/core@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.4.tgz#679bf9ac07900da2ddbb9667bb1afa8029038f53" - integrity sha512-+dsmV8VUs1h/Szb+rEWk8xBM1fp1I///uFy9nk3wXGvRsF2lBp8EVPmtWc+QFRb3MY2b7u2HbkGF1fzoDzQTLA== +"@jest/core@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.6.tgz#c5f642727a0b3bf0f37c4b46c675372d0978d4a1" + integrity sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow== dependencies: - "@jest/console" "^27.0.2" - "@jest/reporters" "^27.0.4" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/reporters" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^27.0.2" - jest-config "^27.0.4" - jest-haste-map "^27.0.2" - jest-message-util "^27.0.2" - jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-resolve-dependencies "^27.0.4" - jest-runner "^27.0.4" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" - jest-watcher "^27.0.2" + jest-changed-files "^27.0.6" + jest-config "^27.0.6" + jest-haste-map "^27.0.6" + jest-message-util "^27.0.6" + jest-regex-util "^27.0.6" + jest-resolve "^27.0.6" + jest-resolve-dependencies "^27.0.6" + jest-runner "^27.0.6" + jest-runtime "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" + jest-watcher "^27.0.6" micromatch "^4.0.4" p-each-series "^2.1.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.3.tgz#68769b1dfdd213e3456169d64fbe9bd63a5fda92" - integrity sha512-pN9m7fbKsop5vc3FOfH8NF7CKKdRbEZzcxfIo1n2TT6ucKWLFq0P6gCJH0GpnQp036++yY9utHOxpeT1WnkWTA== +"@jest/environment@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.6.tgz#ee293fe996db01d7d663b8108fa0e1ff436219d2" + integrity sha512-4XywtdhwZwCpPJ/qfAkqExRsERW+UaoSRStSHCCiQTUpoYdLukj+YJbQSFrZjhlUDRZeNiU9SFH0u7iNimdiIg== dependencies: - "@jest/fake-timers" "^27.0.3" - "@jest/types" "^27.0.2" + "@jest/fake-timers" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" - jest-mock "^27.0.3" + jest-mock "^27.0.6" -"@jest/fake-timers@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.3.tgz#9899ba6304cc636734c74478df502e18136461dd" - integrity sha512-fQ+UCKRIYKvTCEOyKPnaPnomLATIhMnHC/xPZ7yT1Uldp7yMgMxoYIFidDbpSTgB79+/U+FgfoD30c6wg3IUjA== +"@jest/fake-timers@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.6.tgz#cbad52f3fe6abe30e7acb8cd5fa3466b9588e3df" + integrity sha512-sqd+xTWtZ94l3yWDKnRTdvTeZ+A/V7SSKrxsrOKSqdyddb9CeNRF8fbhAU0D7ZJBpTTW2nbp6MftmKJDZfW2LQ== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@sinonjs/fake-timers" "^7.0.2" "@types/node" "*" - jest-message-util "^27.0.2" - jest-mock "^27.0.3" - jest-util "^27.0.2" + jest-message-util "^27.0.6" + jest-mock "^27.0.6" + jest-util "^27.0.6" -"@jest/globals@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.3.tgz#1cf8933b7791bba0b99305cbf39fd4d2e3fe4060" - integrity sha512-OzsIuf7uf+QalqAGbjClyezzEcLQkdZ+7PejUrZgDs+okdAK8GwRCGcYCirHvhMBBQh60Jr3NlIGbn/KBPQLEQ== +"@jest/globals@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.6.tgz#48e3903f99a4650673d8657334d13c9caf0e8f82" + integrity sha512-DdTGCP606rh9bjkdQ7VvChV18iS7q0IMJVP1piwTWyWskol4iqcVwthZmoJEf7obE1nc34OpIyoVGPeqLC+ryw== dependencies: - "@jest/environment" "^27.0.3" - "@jest/types" "^27.0.2" - expect "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/types" "^27.0.6" + expect "^27.0.6" -"@jest/reporters@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.4.tgz#95609b1be97afb80d55d8aa3d7c3179c15810e65" - integrity sha512-Xa90Nm3JnV0xCe4M6A10M9WuN9krb+WFKxV1A98Y4ePCw40n++r7uxFUNU7DT1i9Behj7fjrAIju9oU0t1QtCg== +"@jest/reporters@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.6.tgz#91e7f2d98c002ad5df94d5b5167c1eb0b9fd5b00" + integrity sha512-TIkBt09Cb2gptji3yJXb3EE+eVltW6BjO7frO7NEfjI9vSIYoISi5R3aI3KpEDXlB1xwB+97NXIqz84qYeYsfA== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.0.2" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -527,70 +520,70 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^27.0.2" - jest-resolve "^27.0.4" - jest-util "^27.0.2" - jest-worker "^27.0.2" + jest-haste-map "^27.0.6" + jest-resolve "^27.0.6" + jest-util "^27.0.6" + jest-worker "^27.0.6" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" terminal-link "^2.0.0" - v8-to-istanbul "^7.0.0" + v8-to-istanbul "^8.0.0" -"@jest/source-map@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.1.tgz#2afbf73ddbaddcb920a8e62d0238a0a9e0a8d3e4" - integrity sha512-yMgkF0f+6WJtDMdDYNavmqvbHtiSpwRN2U/W+6uztgfqgkq/PXdKPqjBTUF1RD/feth4rH5N3NW0T5+wIuln1A== +"@jest/source-map@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz#be9e9b93565d49b0548b86e232092491fb60551f" + integrity sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g== dependencies: callsites "^3.0.0" graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.2.tgz#0451049e32ceb609b636004ccc27c8fa22263f10" - integrity sha512-gcdWwL3yP5VaIadzwQtbZyZMgpmes8ryBAJp70tuxghiA8qL4imJyZex+i+USQH2H4jeLVVszhwntgdQ97fccA== +"@jest/test-result@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.6.tgz#3fa42015a14e4fdede6acd042ce98c7f36627051" + integrity sha512-ja/pBOMTufjX4JLEauLxE3LQBPaI2YjGFtXexRAjt1I/MbfNlMx0sytSX3tn5hSLzQsR3Qy2rd0hc1BWojtj9w== dependencies: - "@jest/console" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/types" "^27.0.6" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz#976493b277594d81e589896f0ed21f198308928a" - integrity sha512-6UFEVwdmxYdyNffBxVVZxmXEdBE4riSddXYSnFNH0ELFQFk/bvagizim8WfgJTqF4EKd+j1yFxvhb8BMHfOjSQ== +"@jest/test-sequencer@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz#80a913ed7a1130545b1cd777ff2735dd3af5d34b" + integrity sha512-bISzNIApazYOlTHDum9PwW22NOyDa6VI31n6JucpjTVM0jD6JDgqEZ9+yn575nDdPF0+4csYDxNNW13NvFQGZA== dependencies: - "@jest/test-result" "^27.0.2" + "@jest/test-result" "^27.0.6" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" - jest-runtime "^27.0.4" + jest-haste-map "^27.0.6" + jest-runtime "^27.0.6" -"@jest/transform@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz#b073b7c589e3f4b842102468875def2bb722d6b5" - integrity sha512-H8sqKlgtDfVog/s9I4GG2XMbi4Ar7RBxjsKQDUhn2XHAi3NG+GoQwWMER+YfantzExbjNqQvqBHzo/G2pfTiPw== +"@jest/transform@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.6.tgz#189ad7107413208f7600f4719f81dd2f7278cc95" + integrity sha512-rj5Dw+mtIcntAUnMlW/Vju5mr73u8yg+irnHwzgtgoeI6cCPOvUwQ0D1uQtc/APmWgvRweEb1g05pkUpxH3iCA== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" - jest-regex-util "^27.0.1" - jest-util "^27.0.2" + jest-haste-map "^27.0.6" + jest-regex-util "^27.0.6" + jest-util "^27.0.6" micromatch "^4.0.4" pirates "^4.0.1" slash "^3.0.0" source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz#e153d6c46bda0f2589f0702b071f9898c7bbd37e" - integrity sha512-XpjCtJ/99HB4PmyJ2vgmN7vT+JLP7RW1FBT9RgnMFS4Dt7cvIyBee8O3/j98aUZ34ZpenPZFqmaaObWSeL65dg== +"@jest/types@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.6.tgz#9a992bc517e0c49f035938b8549719c2de40706b" + integrity sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" @@ -715,9 +708,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.11.1" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639" - integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.0.tgz#a34277cf8acbd3185ea74129e1f100491eb1da7f" + integrity sha512-IilJZ1hJBUZwMOVDNTdflOOLzJB/ZtljYVa7k3gEZN/jqIJIPkWHC6dvbX+DD2CwZDHB9wAKzZPzzqMIkW37/w== dependencies: "@babel/types" "^7.3.0" @@ -735,9 +728,9 @@ integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== "@types/filesystem@*": - version "0.0.30" - resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.30.tgz#a7373a2edf34d13e298baf7ee1101f738b2efb7e" - integrity sha512-NCoRgmGmLpTT9VFL6Bb6z0jQuqI3d0E5FGl7M0JOv/J5RQYo9s5aOItPYnpckx9MbYQk1APLXcF8f20Vqnf2yA== + version "0.0.31" + resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.31.tgz#121a1ded274a2dc731d5e0d90163a920ad6a9ef1" + integrity sha512-9Dj1Gb7ZhknhJ8J1H/lTQrEorwIHWZlO9Tfi0WMrvyO1+2GUIUF8Sg4zrID77hj0ywArzQRJ1MwlT9H7c9QmEQ== dependencies: "@types/filewriter" "*" @@ -803,14 +796,14 @@ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "15.12.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26" - integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA== + version "15.12.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.5.tgz#9a78318a45d75c9523d2396131bd3cca54b2d185" + integrity sha512-se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg== "@types/node@^14.6.2": - version "14.17.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz#6d327abaa4be34a74e421ed6409a0ae2f47f4c3d" - integrity sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw== + version "14.17.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz#218712242446fc868d0e007af29a4408c7765bc0" + integrity sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A== "@types/plist@^3.0.1": version "3.0.2" @@ -876,9 +869,9 @@ acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.2.4: - version "8.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz#af53266e698d7cffa416714b503066a82221be60" - integrity sha512-ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w== + version "8.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" + integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== agent-base@6: version "6.0.2" @@ -1100,16 +1093,16 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -babel-jest@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz#7dc18adb01322acce62c2af76ea2c7cd186ade37" - integrity sha512-9OThPl3/IQbo4Yul2vMz4FYwILPQak8XelX4YGowygfHaOl5R5gfjm4iVx4d8aUugkW683t8aq0A74E7b5DU1Q== +babel-jest@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.6.tgz#e99c6e0577da2655118e3608b68761a5a69bd0d8" + integrity sha512-iTJyYLNc4wRofASmofpOc5NK9QunwMk+TLFgGXsTFS8uEqmd8wdI7sga0FPe2oVH3b5Agt/EAK1QjPEuKL8VfA== dependencies: - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^27.0.1" + babel-preset-jest "^27.0.6" chalk "^4.0.0" graceful-fs "^4.2.4" slash "^3.0.0" @@ -1125,10 +1118,10 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.1.tgz#a6d10e484c93abff0f4e95f437dad26e5736ea11" - integrity sha512-sqBF0owAcCDBVEDtxqfYr2F36eSHdx7lAVGyYuOBRnKdD6gzcy0I0XrAYCZgOA3CRrLhmR+Uae9nogPzmAtOfQ== +babel-plugin-jest-hoist@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.6.tgz#f7c6b3d764af21cb4a2a1ab6870117dbde15b456" + integrity sha512-CewFeM9Vv2gM7Yr9n5eyyLVPRSiBnk6lKZRjgwYnGKSl9M14TMn2vkN02wTF04OGuSDLEzlWiMzvjXuW9mB6Gw== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" @@ -1153,12 +1146,12 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.1.tgz#7a50c75d16647c23a2cf5158d5bb9eb206b10e20" - integrity sha512-nIBIqCEpuiyhvjQs2mVNwTxQQa2xk70p9Dd/0obQGBf8FBzbnI8QhQKzLsWMN2i6q+5B0OcWDtrboBX5gmOLyA== +babel-preset-jest@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.6.tgz#909ef08e9f24a4679768be2f60a3df0856843f9d" + integrity sha512-WObA0/Biw2LrVVwZkF/2GqbOdzhKD6Fkdwhoy9ASIrOWr/zodcSpQh72JOkEn6NWyjmnPDjNSqaGN4KnpKzhXw== dependencies: - babel-plugin-jest-hoist "^27.0.1" + babel-plugin-jest-hoist "^27.0.6" babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: @@ -1337,9 +1330,9 @@ camelcase@^6.2.0: integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219: - version "1.0.30001239" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz#66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8" - integrity sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ== + version "1.0.30001241" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz#cd3fae47eb3d7691692b406568d7a3e5b23c7598" + integrity sha512-1uoSZ1Pq1VpH0WerIMqwptXHNNGfdl7d1cJUFs80CwQ/lVzdhTvsFZCeNFslze7AjsQnb4C85tzclPa1VShbeQ== chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" @@ -1528,9 +1521,9 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: safe-buffer "~5.1.1" core-js@^3.6.5: - version "3.15.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz#db9554ebce0b6fd90dc9b1f2465c841d2d055044" - integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw== + version "3.15.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" + integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1622,9 +1615,9 @@ debug@^4.3.2: ms "2.1.2" decimal.js@^10.2.1: - version "10.2.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" - integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== + version "10.3.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== decompress-response@^3.3.0: version "3.3.0" @@ -1680,10 +1673,10 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -diff-sequences@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.1.tgz#9c9801d52ed5f576ff0a20e3022a13ee6e297e7c" - integrity sha512-XPLijkfJUh/PIBnfkcSHgvD6tlYixmcMAn3osTk6jt+H0v/mgURto1XUiD9DKuGX5NDoVS6dSlA23gd9FUaCFg== +diff-sequences@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz#3305cb2e55a033924054695cc66019fd7f8e5723" + integrity sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ== dir-compare@^2.4.0: version "2.4.0" @@ -1799,14 +1792,14 @@ electron-publish@22.11.7: mime "^2.5.2" electron-to-chromium@^1.3.723: - version "1.3.752" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz#0728587f1b9b970ec9ffad932496429aef750d09" - integrity sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A== + version "1.3.763" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.763.tgz#93f6f02506d099941f557b9db9ba50b30215bf15" + integrity sha512-UyvEPae0wvzsyNJhVfGeFSOlUkHEze8xSIiExO5tZQ8QTr7obFiJWGk3U4e7afFOJMQJDszqU/3Pk5jtKiaSEg== -electron@13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz#8c9abf9015766c9cbc16f10c99282d00d6ae1b90" - integrity sha512-aNT9t+LgdQaZ7FgN36pN7MjSEoj+EWc2T9yuOqBApbmR4HavGRadSz7u9N2Erw2ojdIXtei2RVIAvVm8mbDZ0g== +electron@13.1.4: + version "13.1.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.4.tgz#6d20d932a0651c3cba9f09a3d08cbaf5b69aa84b" + integrity sha512-4qhRZbRvGqHmMWsCG/kRVF4X8VIq9Nujgm+gXZLBSpiR6uUtMHy7ViBTQZl1PGf6O9Ppxhpr9Yz+k6Um9WoP3Q== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2" @@ -2052,17 +2045,17 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= -expect@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.2.tgz#e66ca3a4c9592f1c019fa1d46459a9d2084f3422" - integrity sha512-YJFNJe2+P2DqH+ZrXy+ydRQYO87oxRUonZImpDodR1G7qo3NYd3pL+NQ9Keqpez3cehczYwZDBC3A7xk3n7M/w== +expect@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.6.tgz#a4d74fbe27222c718fff68ef49d78e26a8fd4c05" + integrity sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" ansi-styles "^5.0.0" - jest-get-type "^27.0.1" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-regex-util "^27.0.1" + jest-get-type "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-regex-util "^27.0.6" extend@3.0.2: version "3.0.2" @@ -2669,226 +2662,226 @@ jake@^10.6.1: filelist "^1.0.1" minimatch "^3.0.4" -jest-changed-files@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.2.tgz#997253042b4a032950fc5f56abf3c5d1f8560801" - integrity sha512-eMeb1Pn7w7x3wue5/vF73LPCJ7DKQuC9wQUR5ebP9hDPpk5hzcT/3Hmz3Q5BOFpR3tgbmaWhJcMTVgC8Z1NuMw== +jest-changed-files@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.6.tgz#bed6183fcdea8a285482e3b50a9a7712d49a7a8b" + integrity sha512-BuL/ZDauaq5dumYh5y20sn4IISnf1P9A0TDswTxUi84ORGtVa86ApuBHqICL0vepqAnZiY6a7xeSPWv2/yy4eA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" execa "^5.0.0" throat "^6.0.1" -jest-circus@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.4.tgz#3b261514ee3b3da33def736a6352c98ff56bb6e6" - integrity sha512-QD+eblDiRphta630WRKewuASLs/oY1Zki2G4bccntRvrTHQ63ljwFR5TLduuK4Zg0ZPzW0+8o6AP7KRd1yKOjw== +jest-circus@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.6.tgz#dd4df17c4697db6a2c232aaad4e9cec666926668" + integrity sha512-OJlsz6BBeX9qR+7O9lXefWoc2m9ZqcZ5Ohlzz0pTEAG4xMiZUJoacY8f4YDHxgk0oKYxj277AfOk9w6hZYvi1Q== dependencies: - "@jest/environment" "^27.0.3" - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.0.2" + expect "^27.0.6" is-generator-fn "^2.0.0" - jest-each "^27.0.2" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - pretty-format "^27.0.2" + jest-each "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-runtime "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + pretty-format "^27.0.6" slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.4.tgz#491b12c754c0d7c6873b13a66f26b3a80a852910" - integrity sha512-E0T+/i2lxsWAzV7LKYd0SB7HUAvePqaeIh5vX43/G5jXLhv1VzjYzJAGEkTfvxV774ll9cyE2ljcL73PVMEOXQ== +jest-cli@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.6.tgz#d021e5f4d86d6a212450d4c7b86cb219f1e6864f" + integrity sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg== dependencies: - "@jest/core" "^27.0.4" - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/core" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" - jest-config "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-config "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" prompts "^2.0.1" yargs "^16.0.3" -jest-config@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.4.tgz#c4f41378acf40ca77860fb4e213b12109d87b8cf" - integrity sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg== +jest-config@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.6.tgz#119fb10f149ba63d9c50621baa4f1f179500277f" + integrity sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^27.0.4" - "@jest/types" "^27.0.2" - babel-jest "^27.0.2" + "@jest/test-sequencer" "^27.0.6" + "@jest/types" "^27.0.6" + babel-jest "^27.0.6" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" is-ci "^3.0.0" - jest-circus "^27.0.4" - jest-environment-jsdom "^27.0.3" - jest-environment-node "^27.0.3" - jest-get-type "^27.0.1" - jest-jasmine2 "^27.0.4" - jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-runner "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-circus "^27.0.6" + jest-environment-jsdom "^27.0.6" + jest-environment-node "^27.0.6" + jest-get-type "^27.0.6" + jest-jasmine2 "^27.0.6" + jest-regex-util "^27.0.6" + jest-resolve "^27.0.6" + jest-runner "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" micromatch "^4.0.4" - pretty-format "^27.0.2" + pretty-format "^27.0.6" -jest-diff@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.2.tgz#f315b87cee5dc134cf42c2708ab27375cc3f5a7e" - integrity sha512-BFIdRb0LqfV1hBt8crQmw6gGQHVDhM87SpMIZ45FPYKReZYG5er1+5pIn2zKqvrJp6WNox0ylR8571Iwk2Dmgw== +jest-diff@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.6.tgz#4a7a19ee6f04ad70e0e3388f35829394a44c7b5e" + integrity sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg== dependencies: chalk "^4.0.0" - diff-sequences "^27.0.1" - jest-get-type "^27.0.1" - pretty-format "^27.0.2" + diff-sequences "^27.0.6" + jest-get-type "^27.0.6" + pretty-format "^27.0.6" -jest-docblock@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.1.tgz#bd9752819b49fa4fab1a50b73eb58c653b962e8b" - integrity sha512-TA4+21s3oebURc7VgFV4r7ltdIJ5rtBH1E3Tbovcg7AV+oLfD5DcJ2V2vJ5zFA9sL5CFd/d2D6IpsAeSheEdrA== +jest-docblock@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz#cc78266acf7fe693ca462cbbda0ea4e639e4e5f3" + integrity sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA== dependencies: detect-newline "^3.0.0" -jest-each@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.2.tgz#865ddb4367476ced752167926b656fa0dcecd8c7" - integrity sha512-OLMBZBZ6JkoXgUenDtseFRWA43wVl2BwmZYIWQws7eS7pqsIvePqj/jJmEnfq91ALk3LNphgwNK/PRFBYi7ITQ== +jest-each@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.6.tgz#cee117071b04060158dc8d9a66dc50ad40ef453b" + integrity sha512-m6yKcV3bkSWrUIjxkE9OC0mhBZZdhovIW5ergBYirqnkLXkyEn3oUUF/QZgyecA1cF1QFyTE8bRRl8Tfg1pfLA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" chalk "^4.0.0" - jest-get-type "^27.0.1" - jest-util "^27.0.2" - pretty-format "^27.0.2" + jest-get-type "^27.0.6" + jest-util "^27.0.6" + pretty-format "^27.0.6" -jest-environment-jsdom@27.0.3, jest-environment-jsdom@^27.0.3: - version "27.0.3" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz#ed73e913ddc03864eb9f934b5cbabf1b63504e2e" - integrity sha512-5KLmgv1bhiimpSA8oGTnZYk6g4fsNyZiA/6gI2tAZUgrufd7heRUSVh4gRokzZVEj8zlwAQYT0Zs6tuJSW/ECA== +jest-environment-jsdom@27.0.6, jest-environment-jsdom@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz#f66426c4c9950807d0a9f209c590ce544f73291f" + integrity sha512-FvetXg7lnXL9+78H+xUAsra3IeZRTiegA3An01cWeXBspKXUhAwMM9ycIJ4yBaR0L7HkoMPaZsozCLHh4T8fuw== dependencies: - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" - "@jest/types" "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/fake-timers" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" - jest-mock "^27.0.3" - jest-util "^27.0.2" + jest-mock "^27.0.6" + jest-util "^27.0.6" jsdom "^16.6.0" -jest-environment-node@^27.0.3: - version "27.0.3" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.3.tgz#b4acb3679d2552a4215732cab8b0ca7ec4398ee0" - integrity sha512-co2/IVnIFL3cItpFULCvXFg9us4gvWXgs7mutAMPCbFhcqh56QAOdKhNzC2+RycsC/k4mbMj1VF+9F/NzA0ROg== +jest-environment-node@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.6.tgz#a6699b7ceb52e8d68138b9808b0c404e505f3e07" + integrity sha512-+Vi6yLrPg/qC81jfXx3IBlVnDTI6kmRr08iVa2hFCWmJt4zha0XW7ucQltCAPhSR0FEKEoJ3i+W4E6T0s9is0w== dependencies: - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" - "@jest/types" "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/fake-timers" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" - jest-mock "^27.0.3" - jest-util "^27.0.2" + jest-mock "^27.0.6" + jest-util "^27.0.6" -jest-get-type@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.1.tgz#34951e2b08c8801eb28559d7eb732b04bbcf7815" - integrity sha512-9Tggo9zZbu0sHKebiAijyt1NM77Z0uO4tuWOxUCujAiSeXv30Vb5D4xVF4UR4YWNapcftj+PbByU54lKD7/xMg== +jest-get-type@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz#0eb5c7f755854279ce9b68a9f1a4122f69047cfe" + integrity sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg== -jest-haste-map@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz#3f1819400c671237e48b4d4b76a80a0dbed7577f" - integrity sha512-37gYfrYjjhEfk37C4bCMWAC0oPBxDpG0qpl8lYg8BT//wf353YT/fzgA7+Dq0EtM7rPFS3JEcMsxdtDwNMi2cA== +jest-haste-map@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.6.tgz#4683a4e68f6ecaa74231679dca237279562c8dc7" + integrity sha512-4ldjPXX9h8doB2JlRzg9oAZ2p6/GpQUNAeiYXqcpmrKbP0Qev0wdZlxSMOmz8mPOEnt4h6qIzXFLDi8RScX/1w== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/graceful-fs" "^4.1.2" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.4" - jest-regex-util "^27.0.1" - jest-serializer "^27.0.1" - jest-util "^27.0.2" - jest-worker "^27.0.2" + jest-regex-util "^27.0.6" + jest-serializer "^27.0.6" + jest-util "^27.0.6" + jest-worker "^27.0.6" micromatch "^4.0.4" walker "^1.0.7" optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz#c669519ccf4904a485338555e1e66cad36bb0670" - integrity sha512-yj3WrjjquZwkJw+eA4c9yucHw4/+EHndHWSqgHbHGQfT94ihaaQsa009j1a0puU8CNxPDk0c1oAPeOpdJUElwA== +jest-jasmine2@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz#fd509a9ed3d92bd6edb68a779f4738b100655b37" + integrity sha512-cjpH2sBy+t6dvCeKBsHpW41mjHzXgsavaFMp+VWRf0eR4EW8xASk1acqmljFtK2DgyIECMv2yCdY41r2l1+4iA== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^27.0.3" - "@jest/source-map" "^27.0.1" - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/source-map" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^27.0.2" + expect "^27.0.6" is-generator-fn "^2.0.0" - jest-each "^27.0.2" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - pretty-format "^27.0.2" + jest-each "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-runtime "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + pretty-format "^27.0.6" throat "^6.0.1" -jest-leak-detector@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.2.tgz#ce19aa9dbcf7a72a9d58907a970427506f624e69" - integrity sha512-TZA3DmCOfe8YZFIMD1GxFqXUkQnIoOGQyy4hFCA2mlHtnAaf+FeOMxi0fZmfB41ZL+QbFG6BVaZF5IeFIVy53Q== +jest-leak-detector@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz#545854275f85450d4ef4b8fe305ca2a26450450f" + integrity sha512-2/d6n2wlH5zEcdctX4zdbgX8oM61tb67PQt4Xh8JFAIy6LRKUnX528HulkaG6nD5qDl5vRV1NXejCe1XRCH5gQ== dependencies: - jest-get-type "^27.0.1" - pretty-format "^27.0.2" + jest-get-type "^27.0.6" + pretty-format "^27.0.6" -jest-matcher-utils@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz#f14c060605a95a466cdc759acc546c6f4cbfc4f0" - integrity sha512-Qczi5xnTNjkhcIB0Yy75Txt+Ez51xdhOxsukN7awzq2auZQGPHcQrJ623PZj0ECDEMOk2soxWx05EXdXGd1CbA== +jest-matcher-utils@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz#2a8da1e86c620b39459f4352eaa255f0d43e39a9" + integrity sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA== dependencies: chalk "^4.0.0" - jest-diff "^27.0.2" - jest-get-type "^27.0.1" - pretty-format "^27.0.2" + jest-diff "^27.0.6" + jest-get-type "^27.0.6" + pretty-format "^27.0.6" -jest-message-util@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.2.tgz#181c9b67dff504d8f4ad15cba10d8b80f272048c" - integrity sha512-rTqWUX42ec2LdMkoUPOzrEd1Tcm+R1KfLOmFK+OVNo4MnLsEaxO5zPDb2BbdSmthdM/IfXxOZU60P/WbWF8BTw== +jest-message-util@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.6.tgz#158bcdf4785706492d164a39abca6a14da5ab8b5" + integrity sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.4" micromatch "^4.0.4" - pretty-format "^27.0.2" + pretty-format "^27.0.6" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^27.0.3: - version "27.0.3" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.3.tgz#5591844f9192b3335c0dca38e8e45ed297d4d23d" - integrity sha512-O5FZn5XDzEp+Xg28mUz4ovVcdwBBPfAhW9+zJLO0Efn2qNbYcDaJvSlRiQ6BCZUCVOJjALicuJQI9mRFjv1o9Q== +jest-mock@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.6.tgz#0efdd40851398307ba16778728f6d34d583e3467" + integrity sha512-lzBETUoK8cSxts2NYXSBWT+EJNzmUVtVVwS1sU9GwE1DLCfGsngg+ZVSIe0yd0ZSm+y791esiuo+WSwpXJQ5Bw== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/node" "*" jest-pnp-resolver@^1.2.2: @@ -2896,76 +2889,76 @@ jest-pnp-resolver@^1.2.2: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== -jest-regex-util@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz#69d4b1bf5b690faa3490113c47486ed85dd45b68" - integrity sha512-6nY6QVcpTgEKQy1L41P4pr3aOddneK17kn3HJw6SdwGiKfgCGTvH02hVXL0GU8GEKtPH83eD2DIDgxHXOxVohQ== +jest-regex-util@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5" + integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ== -jest-resolve-dependencies@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz#a07a242d70d668afd3fcf7f4270755eebb1fe579" - integrity sha512-F33UPfw1YGWCV2uxJl7wD6TvcQn5IC0LtguwY3r4L7R6H4twpLkp5Q2ZfzRx9A2I3G8feiy0O0sqcn/Qoym71A== +jest-resolve-dependencies@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz#3e619e0ef391c3ecfcf6ef4056207a3d2be3269f" + integrity sha512-mg9x9DS3BPAREWKCAoyg3QucCr0n6S8HEEsqRCKSPjPcu9HzRILzhdzY3imsLoZWeosEbJZz6TKasveczzpJZA== dependencies: - "@jest/types" "^27.0.2" - jest-regex-util "^27.0.1" - jest-snapshot "^27.0.4" + "@jest/types" "^27.0.6" + jest-regex-util "^27.0.6" + jest-snapshot "^27.0.6" -jest-resolve@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.4.tgz#8a27bc3f2f00c8ea28f3bc99bbf6f468300a703d" - integrity sha512-BcfyK2i3cG79PDb/6gB6zFeFQlcqLsQjGBqznFCpA0L/3l1L/oOsltdUjs5eISAWA9HS9qtj8v2PSZr/yWxONQ== +jest-resolve@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.6.tgz#e90f436dd4f8fbf53f58a91c42344864f8e55bff" + integrity sha512-yKmIgw2LgTh7uAJtzv8UFHGF7Dm7XfvOe/LQ3Txv101fLM8cx2h1QVwtSJ51Q/SCxpIiKfVn6G2jYYMDNHZteA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" chalk "^4.0.0" escalade "^3.1.1" graceful-fs "^4.2.4" jest-pnp-resolver "^1.2.2" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-util "^27.0.6" + jest-validate "^27.0.6" resolve "^1.20.0" slash "^3.0.0" -jest-runner@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.4.tgz#2787170a9509b792ae129794f6944d27d5d12a4f" - integrity sha512-NfmvSYLCsCJk2AG8Ar2NAh4PhsJJpO+/r+g4bKR5L/5jFzx/indUpnVBdrfDvuqhGLLAvrKJ9FM/Nt8o1dsqxg== +jest-runner@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.6.tgz#1325f45055539222bbc7256a6976e993ad2f9520" + integrity sha512-W3Bz5qAgaSChuivLn+nKOgjqNxM7O/9JOJoKDCqThPIg2sH/d4A/lzyiaFgnb9V1/w29Le11NpzTJSzga1vyYQ== dependencies: - "@jest/console" "^27.0.2" - "@jest/environment" "^27.0.3" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/environment" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-docblock "^27.0.1" - jest-environment-jsdom "^27.0.3" - jest-environment-node "^27.0.3" - jest-haste-map "^27.0.2" - jest-leak-detector "^27.0.2" - jest-message-util "^27.0.2" - jest-resolve "^27.0.4" - jest-runtime "^27.0.4" - jest-util "^27.0.2" - jest-worker "^27.0.2" + jest-docblock "^27.0.6" + jest-environment-jsdom "^27.0.6" + jest-environment-node "^27.0.6" + jest-haste-map "^27.0.6" + jest-leak-detector "^27.0.6" + jest-message-util "^27.0.6" + jest-resolve "^27.0.6" + jest-runtime "^27.0.6" + jest-util "^27.0.6" + jest-worker "^27.0.6" source-map-support "^0.5.6" throat "^6.0.1" -jest-runtime@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.4.tgz#2e4a6aa77cac32ac612dfe12768387a8aa15c2f0" - integrity sha512-voJB4xbAjS/qYPboV+e+gmg3jfvHJJY4CagFWBOM9dQKtlaiTjcpD2tWwla84Z7PtXSQPeIpXY0qksA9Dum29A== +jest-runtime@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.6.tgz#45877cfcd386afdd4f317def551fc369794c27c9" + integrity sha512-BhvHLRVfKibYyqqEFkybsznKwhrsu7AWx2F3y9G9L95VSIN3/ZZ9vBpm/XCS2bS+BWz3sSeNGLzI3TVQ0uL85Q== dependencies: - "@jest/console" "^27.0.2" - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" - "@jest/globals" "^27.0.3" - "@jest/source-map" "^27.0.1" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/environment" "^27.0.6" + "@jest/fake-timers" "^27.0.6" + "@jest/globals" "^27.0.6" + "@jest/source-map" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/yargs" "^16.0.0" chalk "^4.0.0" cjs-module-lexer "^1.0.0" @@ -2973,30 +2966,30 @@ jest-runtime@^27.0.4: exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" - jest-message-util "^27.0.2" - jest-mock "^27.0.3" - jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-haste-map "^27.0.6" + jest-message-util "^27.0.6" + jest-mock "^27.0.6" + jest-regex-util "^27.0.6" + jest-resolve "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" slash "^3.0.0" strip-bom "^4.0.0" yargs "^16.0.3" -jest-serializer@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.1.tgz#2464d04dcc33fb71dc80b7c82e3c5e8a08cb1020" - integrity sha512-svy//5IH6bfQvAbkAEg1s7xhhgHTtXu0li0I2fdKHDsLP2P2MOiscPQIENQep8oU2g2B3jqLyxKKzotZOz4CwQ== +jest-serializer@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz#93a6c74e0132b81a2d54623251c46c498bb5bec1" + integrity sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA== dependencies: "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.4.tgz#2b96e22ca90382b3e93bd0aae2ce4c78bf51fb5b" - integrity sha512-hnjrvpKGdSMvKfbHyaG5Kul7pDJGZvjVy0CKpzhu28MmAssDXS6GpynhXzgst1wBQoKD8c9b2VS2a5yhDLQRCA== +jest-snapshot@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.6.tgz#f4e6b208bd2e92e888344d78f0f650bcff05a4bf" + integrity sha512-NTHaz8He+ATUagUgE7C/UtFcRoHqR2Gc+KDfhQIyx+VFgwbeEMjeP+ILpUTLosZn/ZtbNdCF5LkVnN/l+V751A== dependencies: "@babel/core" "^7.7.2" "@babel/generator" "^7.7.2" @@ -3004,79 +2997,79 @@ jest-snapshot@^27.0.4: "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.0.0" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.0.2" + expect "^27.0.6" graceful-fs "^4.2.4" - jest-diff "^27.0.2" - jest-get-type "^27.0.1" - jest-haste-map "^27.0.2" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-resolve "^27.0.4" - jest-util "^27.0.2" + jest-diff "^27.0.6" + jest-get-type "^27.0.6" + jest-haste-map "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-resolve "^27.0.6" + jest-util "^27.0.6" natural-compare "^1.4.0" - pretty-format "^27.0.2" + pretty-format "^27.0.6" semver "^7.3.2" -jest-util@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz#fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7" - integrity sha512-1d9uH3a00OFGGWSibpNYr+jojZ6AckOMCXV2Z4K3YXDnzpkAaXQyIpY14FOJPiUmil7CD+A6Qs+lnnh6ctRbIA== +jest-util@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz#e8e04eec159de2f4d5f57f795df9cdc091e50297" + integrity sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" graceful-fs "^4.2.4" is-ci "^3.0.0" picomatch "^2.2.3" -jest-validate@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.2.tgz#7fe2c100089449cd5cbb47a5b0b6cb7cda5beee5" - integrity sha512-UgBF6/oVu1ofd1XbaSotXKihi8nZhg0Prm8twQ9uCuAfo59vlxCXMPI/RKmrZEVgi3Nd9dS0I8A0wzWU48pOvg== +jest-validate@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.6.tgz#930a527c7a951927df269f43b2dc23262457e2a6" + integrity sha512-yhZZOaMH3Zg6DC83n60pLmdU1DQE46DW+KLozPiPbSbPhlXXaiUTDlhHQhHFpaqIFRrInko1FHXjTRpjWRuWfA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^27.0.1" + jest-get-type "^27.0.6" leven "^3.1.0" - pretty-format "^27.0.2" + pretty-format "^27.0.6" -jest-watcher@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.2.tgz#dab5f9443e2d7f52597186480731a8c6335c5deb" - integrity sha512-8nuf0PGuTxWj/Ytfw5fyvNn/R80iXY8QhIT0ofyImUvdnoaBdT6kob0GmhXR+wO+ALYVnh8bQxN4Tjfez0JgkA== +jest-watcher@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.6.tgz#89526f7f9edf1eac4e4be989bcb6dec6b8878d9c" + integrity sha512-/jIoKBhAP00/iMGnTwUBLgvxkn7vsOweDrOTSPzc7X9uOyUtJIDthQBTI1EXz90bdkrxorUZVhJwiB69gcHtYQ== dependencies: - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.0.2" + jest-util "^27.0.6" string-length "^4.0.1" -jest-worker@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz#4ebeb56cef48b3e7514552f80d0d80c0129f0b05" - integrity sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg== +jest-worker@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz#a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed" + integrity sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA== dependencies: "@types/node" "*" merge-stream "^2.0.0" supports-color "^8.0.0" -jest@27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.4.tgz#91d4d564b36bcf93b98dac1ab19f07089e670f53" - integrity sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA== +jest@27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.6.tgz#10517b2a628f0409087fbf473db44777d7a04505" + integrity sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA== dependencies: - "@jest/core" "^27.0.4" + "@jest/core" "^27.0.6" import-local "^3.0.2" - jest-cli "^27.0.4" + jest-cli "^27.0.6" js-tokens@^4.0.0: version "4.0.0" @@ -3622,12 +3615,12 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -pretty-format@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.2.tgz#9283ff8c4f581b186b2d4da461617143dca478a4" - integrity sha512-mXKbbBPnYTG7Yra9qFBtqj+IXcsvxsvOBco3QHxtxTl+hHKq6QdzMZ+q0CtL4ORHZgwGImRr2XZUX2EWzORxig== +pretty-format@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz#ab770c47b2c6f893a21aefc57b75da63ef49a11f" + integrity sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" ansi-regex "^5.0.0" ansi-styles "^5.0.0" react-is "^17.0.1" @@ -4364,10 +4357,10 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== -v8-to-istanbul@^7.0.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" - integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== +v8-to-istanbul@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz#4229f2a99e367f3f018fa1d5c2b8ec684667c69c" + integrity sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -4426,9 +4419,9 @@ whatwg-mimetype@^2.3.0: integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz#27c0205a4902084b872aecb97cf0f2a7a3011f4c" - integrity sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw== + version "8.7.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== dependencies: lodash "^4.7.0" tr46 "^2.1.0" @@ -4478,9 +4471,9 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^7.4.5: - version "7.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz#0033bafea031fb9df041b2026fc72a571ca44691" - integrity sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw== + version "7.5.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.1.tgz#44fc000d87edb1d9c53e51fbc69a0ac1f6871d66" + integrity sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow== xdg-basedir@^4.0.0: version "4.0.0" diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index 14e1b9902cca..a92d6defef9f 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -26,11 +26,11 @@ }; } { - name = "_babel_compat_data___compat_data_7.14.5.tgz"; + name = "_babel_compat_data___compat_data_7.14.7.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz"; - sha1 = "8ef4c18e58e801c5c95d3c1c0f2874a2680fadea"; + name = "_babel_compat_data___compat_data_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz"; + sha1 = "7b047d7a3a89a67d2258dc61f604f098f1bc7e08"; }; } { @@ -82,11 +82,11 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz"; - sha1 = "d5c70e4ad13b402c95156c7a53568f504e2fb7b8"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz"; + sha1 = "97e56244beb94211fe277bd818e3a329c66f7970"; }; } { @@ -178,11 +178,11 @@ }; } { - name = "_babel_parser___parser_7.14.6.tgz"; + name = "_babel_parser___parser_7.14.7.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz"; - sha1 = "d85cc68ca3cac84eae384c06f032921f5227f4b2"; + name = "_babel_parser___parser_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz"; + sha1 = "6099720c8839ca865a2637e6c85852ead0bdb595"; }; } { @@ -298,11 +298,11 @@ }; } { - name = "_babel_traverse___traverse_7.14.5.tgz"; + name = "_babel_traverse___traverse_7.14.7.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz"; - sha1 = "c111b0f58afab4fea3d3385a406f692748c59870"; + name = "_babel_traverse___traverse_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz"; + sha1 = "64007c9774cfdc3abd23b0780bc18a3ce3631753"; }; } { @@ -329,14 +329,6 @@ sha1 = "643849d5f08c167eb84a2e7e3f1f9fbc41a3889b"; }; } - { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.1.tgz"; - path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz"; - sha1 = "8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af"; - }; - } { name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz"; path = fetchurl { @@ -346,11 +338,11 @@ }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.22.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz"; - sha1 = "13fe6de4be0c3beb2851634b27ea1223d10ca92b"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.22.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.2.tgz"; + sha1 = "85af3b49f7f653e6fb0d008b6523e3b3ba0dd41e"; }; } { @@ -418,91 +410,91 @@ }; } { - name = "_jest_console___console_27.0.2.tgz"; + name = "_jest_console___console_27.0.6.tgz"; path = fetchurl { - name = "_jest_console___console_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/console/-/console-27.0.2.tgz"; - sha1 = "b8eeff8f21ac51d224c851e1729d2630c18631e6"; + name = "_jest_console___console_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-27.0.6.tgz"; + sha1 = "3eb72ea80897495c3d73dd97aab7f26770e2260f"; }; } { - name = "_jest_core___core_27.0.4.tgz"; + name = "_jest_core___core_27.0.6.tgz"; path = fetchurl { - name = "_jest_core___core_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/@jest/core/-/core-27.0.4.tgz"; - sha1 = "679bf9ac07900da2ddbb9667bb1afa8029038f53"; + name = "_jest_core___core_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-27.0.6.tgz"; + sha1 = "c5f642727a0b3bf0f37c4b46c675372d0978d4a1"; }; } { - name = "_jest_environment___environment_27.0.3.tgz"; + name = "_jest_environment___environment_27.0.6.tgz"; path = fetchurl { - name = "_jest_environment___environment_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.3.tgz"; - sha1 = "68769b1dfdd213e3456169d64fbe9bd63a5fda92"; + name = "_jest_environment___environment_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.6.tgz"; + sha1 = "ee293fe996db01d7d663b8108fa0e1ff436219d2"; }; } { - name = "_jest_fake_timers___fake_timers_27.0.3.tgz"; + name = "_jest_fake_timers___fake_timers_27.0.6.tgz"; path = fetchurl { - name = "_jest_fake_timers___fake_timers_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.3.tgz"; - sha1 = "9899ba6304cc636734c74478df502e18136461dd"; + name = "_jest_fake_timers___fake_timers_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.6.tgz"; + sha1 = "cbad52f3fe6abe30e7acb8cd5fa3466b9588e3df"; }; } { - name = "_jest_globals___globals_27.0.3.tgz"; + name = "_jest_globals___globals_27.0.6.tgz"; path = fetchurl { - name = "_jest_globals___globals_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.3.tgz"; - sha1 = "1cf8933b7791bba0b99305cbf39fd4d2e3fe4060"; + name = "_jest_globals___globals_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.6.tgz"; + sha1 = "48e3903f99a4650673d8657334d13c9caf0e8f82"; }; } { - name = "_jest_reporters___reporters_27.0.4.tgz"; + name = "_jest_reporters___reporters_27.0.6.tgz"; path = fetchurl { - name = "_jest_reporters___reporters_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.4.tgz"; - sha1 = "95609b1be97afb80d55d8aa3d7c3179c15810e65"; + name = "_jest_reporters___reporters_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.6.tgz"; + sha1 = "91e7f2d98c002ad5df94d5b5167c1eb0b9fd5b00"; }; } { - name = "_jest_source_map___source_map_27.0.1.tgz"; + name = "_jest_source_map___source_map_27.0.6.tgz"; path = fetchurl { - name = "_jest_source_map___source_map_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.1.tgz"; - sha1 = "2afbf73ddbaddcb920a8e62d0238a0a9e0a8d3e4"; + name = "_jest_source_map___source_map_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz"; + sha1 = "be9e9b93565d49b0548b86e232092491fb60551f"; }; } { - name = "_jest_test_result___test_result_27.0.2.tgz"; + name = "_jest_test_result___test_result_27.0.6.tgz"; path = fetchurl { - name = "_jest_test_result___test_result_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.2.tgz"; - sha1 = "0451049e32ceb609b636004ccc27c8fa22263f10"; + name = "_jest_test_result___test_result_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.6.tgz"; + sha1 = "3fa42015a14e4fdede6acd042ce98c7f36627051"; }; } { - name = "_jest_test_sequencer___test_sequencer_27.0.4.tgz"; + name = "_jest_test_sequencer___test_sequencer_27.0.6.tgz"; path = fetchurl { - name = "_jest_test_sequencer___test_sequencer_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz"; - sha1 = "976493b277594d81e589896f0ed21f198308928a"; + name = "_jest_test_sequencer___test_sequencer_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz"; + sha1 = "80a913ed7a1130545b1cd777ff2735dd3af5d34b"; }; } { - name = "_jest_transform___transform_27.0.2.tgz"; + name = "_jest_transform___transform_27.0.6.tgz"; path = fetchurl { - name = "_jest_transform___transform_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz"; - sha1 = "b073b7c589e3f4b842102468875def2bb722d6b5"; + name = "_jest_transform___transform_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.6.tgz"; + sha1 = "189ad7107413208f7600f4719f81dd2f7278cc95"; }; } { - name = "_jest_types___types_27.0.2.tgz"; + name = "_jest_types___types_27.0.6.tgz"; path = fetchurl { - name = "_jest_types___types_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz"; - sha1 = "e153d6c46bda0f2589f0702b071f9898c7bbd37e"; + name = "_jest_types___types_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.6.tgz"; + sha1 = "9a992bc517e0c49f035938b8549719c2de40706b"; }; } { @@ -642,11 +634,11 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; + name = "_types_babel__traverse___babel__traverse_7.14.0.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz"; - sha1 = "654f6c4f67568e24c23b367e947098c6206fa639"; + name = "_types_babel__traverse___babel__traverse_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.0.tgz"; + sha1 = "a34277cf8acbd3185ea74129e1f100491eb1da7f"; }; } { @@ -666,11 +658,11 @@ }; } { - name = "_types_filesystem___filesystem_0.0.30.tgz"; + name = "_types_filesystem___filesystem_0.0.31.tgz"; path = fetchurl { - name = "_types_filesystem___filesystem_0.0.30.tgz"; - url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.30.tgz"; - sha1 = "a7373a2edf34d13e298baf7ee1101f738b2efb7e"; + name = "_types_filesystem___filesystem_0.0.31.tgz"; + url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.31.tgz"; + sha1 = "121a1ded274a2dc731d5e0d90163a920ad6a9ef1"; }; } { @@ -754,19 +746,19 @@ }; } { - name = "_types_node___node_15.12.4.tgz"; + name = "_types_node___node_15.12.5.tgz"; path = fetchurl { - name = "_types_node___node_15.12.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz"; - sha1 = "e1cf817d70a1e118e81922c4ff6683ce9d422e26"; + name = "_types_node___node_15.12.5.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.5.tgz"; + sha1 = "9a78318a45d75c9523d2396131bd3cca54b2d185"; }; } { - name = "_types_node___node_14.17.3.tgz"; + name = "_types_node___node_14.17.4.tgz"; path = fetchurl { - name = "_types_node___node_14.17.3.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz"; - sha1 = "6d327abaa4be34a74e421ed6409a0ae2f47f4c3d"; + name = "_types_node___node_14.17.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz"; + sha1 = "218712242446fc868d0e007af29a4408c7765bc0"; }; } { @@ -858,11 +850,11 @@ }; } { - name = "acorn___acorn_8.4.0.tgz"; + name = "acorn___acorn_8.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz"; - sha1 = "af53266e698d7cffa416714b503066a82221be60"; + name = "acorn___acorn_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz"; + sha1 = "56c36251fc7cabc7096adc18f05afe814321a28c"; }; } { @@ -1098,11 +1090,11 @@ }; } { - name = "babel_jest___babel_jest_27.0.2.tgz"; + name = "babel_jest___babel_jest_27.0.6.tgz"; path = fetchurl { - name = "babel_jest___babel_jest_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz"; - sha1 = "7dc18adb01322acce62c2af76ea2c7cd186ade37"; + name = "babel_jest___babel_jest_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.6.tgz"; + sha1 = "e99c6e0577da2655118e3608b68761a5a69bd0d8"; }; } { @@ -1114,11 +1106,11 @@ }; } { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.6.tgz"; path = fetchurl { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.1.tgz"; - sha1 = "a6d10e484c93abff0f4e95f437dad26e5736ea11"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.6.tgz"; + sha1 = "f7c6b3d764af21cb4a2a1ab6870117dbde15b456"; }; } { @@ -1130,11 +1122,11 @@ }; } { - name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz"; + name = "babel_preset_jest___babel_preset_jest_27.0.6.tgz"; path = fetchurl { - name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.1.tgz"; - sha1 = "7a50c75d16647c23a2cf5158d5bb9eb206b10e20"; + name = "babel_preset_jest___babel_preset_jest_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.6.tgz"; + sha1 = "909ef08e9f24a4679768be2f60a3df0856843f9d"; }; } { @@ -1322,11 +1314,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz"; - sha1 = "66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8"; + name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz"; + sha1 = "cd3fae47eb3d7691692b406568d7a3e5b23c7598"; }; } { @@ -1554,11 +1546,11 @@ }; } { - name = "core_js___core_js_3.15.0.tgz"; + name = "core_js___core_js_3.15.2.tgz"; path = fetchurl { - name = "core_js___core_js_3.15.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz"; - sha1 = "db9554ebce0b6fd90dc9b1f2465c841d2d055044"; + name = "core_js___core_js_3.15.2.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz"; + sha1 = "740660d2ff55ef34ce664d7e2455119c5bdd3d61"; }; } { @@ -1666,11 +1658,11 @@ }; } { - name = "decimal.js___decimal.js_10.2.1.tgz"; + name = "decimal.js___decimal.js_10.3.1.tgz"; path = fetchurl { - name = "decimal.js___decimal.js_10.2.1.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz"; - sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3"; + name = "decimal.js___decimal.js_10.3.1.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz"; + sha1 = "d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"; }; } { @@ -1754,11 +1746,11 @@ }; } { - name = "diff_sequences___diff_sequences_27.0.1.tgz"; + name = "diff_sequences___diff_sequences_27.0.6.tgz"; path = fetchurl { - name = "diff_sequences___diff_sequences_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.1.tgz"; - sha1 = "9c9801d52ed5f576ff0a20e3022a13ee6e297e7c"; + name = "diff_sequences___diff_sequences_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz"; + sha1 = "3305cb2e55a033924054695cc66019fd7f8e5723"; }; } { @@ -1858,19 +1850,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.763.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz"; - sha1 = "0728587f1b9b970ec9ffad932496429aef750d09"; + name = "electron_to_chromium___electron_to_chromium_1.3.763.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.763.tgz"; + sha1 = "93f6f02506d099941f557b9db9ba50b30215bf15"; }; } { - name = "electron___electron_13.1.2.tgz"; + name = "electron___electron_13.1.4.tgz"; path = fetchurl { - name = "electron___electron_13.1.2.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz"; - sha1 = "8c9abf9015766c9cbc16f10c99282d00d6ae1b90"; + name = "electron___electron_13.1.4.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.1.4.tgz"; + sha1 = "6d20d932a0651c3cba9f09a3d08cbaf5b69aa84b"; }; } { @@ -2122,11 +2114,11 @@ }; } { - name = "expect___expect_27.0.2.tgz"; + name = "expect___expect_27.0.6.tgz"; path = fetchurl { - name = "expect___expect_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-27.0.2.tgz"; - sha1 = "e66ca3a4c9592f1c019fa1d46459a9d2084f3422"; + name = "expect___expect_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-27.0.6.tgz"; + sha1 = "a4d74fbe27222c718fff68ef49d78e26a8fd4c05"; }; } { @@ -2866,131 +2858,131 @@ }; } { - name = "jest_changed_files___jest_changed_files_27.0.2.tgz"; + name = "jest_changed_files___jest_changed_files_27.0.6.tgz"; path = fetchurl { - name = "jest_changed_files___jest_changed_files_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.2.tgz"; - sha1 = "997253042b4a032950fc5f56abf3c5d1f8560801"; + name = "jest_changed_files___jest_changed_files_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.6.tgz"; + sha1 = "bed6183fcdea8a285482e3b50a9a7712d49a7a8b"; }; } { - name = "jest_circus___jest_circus_27.0.4.tgz"; + name = "jest_circus___jest_circus_27.0.6.tgz"; path = fetchurl { - name = "jest_circus___jest_circus_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.4.tgz"; - sha1 = "3b261514ee3b3da33def736a6352c98ff56bb6e6"; + name = "jest_circus___jest_circus_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.6.tgz"; + sha1 = "dd4df17c4697db6a2c232aaad4e9cec666926668"; }; } { - name = "jest_cli___jest_cli_27.0.4.tgz"; + name = "jest_cli___jest_cli_27.0.6.tgz"; path = fetchurl { - name = "jest_cli___jest_cli_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.4.tgz"; - sha1 = "491b12c754c0d7c6873b13a66f26b3a80a852910"; + name = "jest_cli___jest_cli_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.6.tgz"; + sha1 = "d021e5f4d86d6a212450d4c7b86cb219f1e6864f"; }; } { - name = "jest_config___jest_config_27.0.4.tgz"; + name = "jest_config___jest_config_27.0.6.tgz"; path = fetchurl { - name = "jest_config___jest_config_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.4.tgz"; - sha1 = "c4f41378acf40ca77860fb4e213b12109d87b8cf"; + name = "jest_config___jest_config_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.6.tgz"; + sha1 = "119fb10f149ba63d9c50621baa4f1f179500277f"; }; } { - name = "jest_diff___jest_diff_27.0.2.tgz"; + name = "jest_diff___jest_diff_27.0.6.tgz"; path = fetchurl { - name = "jest_diff___jest_diff_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.2.tgz"; - sha1 = "f315b87cee5dc134cf42c2708ab27375cc3f5a7e"; + name = "jest_diff___jest_diff_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.6.tgz"; + sha1 = "4a7a19ee6f04ad70e0e3388f35829394a44c7b5e"; }; } { - name = "jest_docblock___jest_docblock_27.0.1.tgz"; + name = "jest_docblock___jest_docblock_27.0.6.tgz"; path = fetchurl { - name = "jest_docblock___jest_docblock_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.1.tgz"; - sha1 = "bd9752819b49fa4fab1a50b73eb58c653b962e8b"; + name = "jest_docblock___jest_docblock_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz"; + sha1 = "cc78266acf7fe693ca462cbbda0ea4e639e4e5f3"; }; } { - name = "jest_each___jest_each_27.0.2.tgz"; + name = "jest_each___jest_each_27.0.6.tgz"; path = fetchurl { - name = "jest_each___jest_each_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.2.tgz"; - sha1 = "865ddb4367476ced752167926b656fa0dcecd8c7"; + name = "jest_each___jest_each_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.6.tgz"; + sha1 = "cee117071b04060158dc8d9a66dc50ad40ef453b"; }; } { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.3.tgz"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.0.6.tgz"; path = fetchurl { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz"; - sha1 = "ed73e913ddc03864eb9f934b5cbabf1b63504e2e"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz"; + sha1 = "f66426c4c9950807d0a9f209c590ce544f73291f"; }; } { - name = "jest_environment_node___jest_environment_node_27.0.3.tgz"; + name = "jest_environment_node___jest_environment_node_27.0.6.tgz"; path = fetchurl { - name = "jest_environment_node___jest_environment_node_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.3.tgz"; - sha1 = "b4acb3679d2552a4215732cab8b0ca7ec4398ee0"; + name = "jest_environment_node___jest_environment_node_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.6.tgz"; + sha1 = "a6699b7ceb52e8d68138b9808b0c404e505f3e07"; }; } { - name = "jest_get_type___jest_get_type_27.0.1.tgz"; + name = "jest_get_type___jest_get_type_27.0.6.tgz"; path = fetchurl { - name = "jest_get_type___jest_get_type_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.1.tgz"; - sha1 = "34951e2b08c8801eb28559d7eb732b04bbcf7815"; + name = "jest_get_type___jest_get_type_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz"; + sha1 = "0eb5c7f755854279ce9b68a9f1a4122f69047cfe"; }; } { - name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; + name = "jest_haste_map___jest_haste_map_27.0.6.tgz"; path = fetchurl { - name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz"; - sha1 = "3f1819400c671237e48b4d4b76a80a0dbed7577f"; + name = "jest_haste_map___jest_haste_map_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.6.tgz"; + sha1 = "4683a4e68f6ecaa74231679dca237279562c8dc7"; }; } { - name = "jest_jasmine2___jest_jasmine2_27.0.4.tgz"; + name = "jest_jasmine2___jest_jasmine2_27.0.6.tgz"; path = fetchurl { - name = "jest_jasmine2___jest_jasmine2_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz"; - sha1 = "c669519ccf4904a485338555e1e66cad36bb0670"; + name = "jest_jasmine2___jest_jasmine2_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz"; + sha1 = "fd509a9ed3d92bd6edb68a779f4738b100655b37"; }; } { - name = "jest_leak_detector___jest_leak_detector_27.0.2.tgz"; + name = "jest_leak_detector___jest_leak_detector_27.0.6.tgz"; path = fetchurl { - name = "jest_leak_detector___jest_leak_detector_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.2.tgz"; - sha1 = "ce19aa9dbcf7a72a9d58907a970427506f624e69"; + name = "jest_leak_detector___jest_leak_detector_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz"; + sha1 = "545854275f85450d4ef4b8fe305ca2a26450450f"; }; } { - name = "jest_matcher_utils___jest_matcher_utils_27.0.2.tgz"; + name = "jest_matcher_utils___jest_matcher_utils_27.0.6.tgz"; path = fetchurl { - name = "jest_matcher_utils___jest_matcher_utils_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz"; - sha1 = "f14c060605a95a466cdc759acc546c6f4cbfc4f0"; + name = "jest_matcher_utils___jest_matcher_utils_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz"; + sha1 = "2a8da1e86c620b39459f4352eaa255f0d43e39a9"; }; } { - name = "jest_message_util___jest_message_util_27.0.2.tgz"; + name = "jest_message_util___jest_message_util_27.0.6.tgz"; path = fetchurl { - name = "jest_message_util___jest_message_util_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.2.tgz"; - sha1 = "181c9b67dff504d8f4ad15cba10d8b80f272048c"; + name = "jest_message_util___jest_message_util_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.6.tgz"; + sha1 = "158bcdf4785706492d164a39abca6a14da5ab8b5"; }; } { - name = "jest_mock___jest_mock_27.0.3.tgz"; + name = "jest_mock___jest_mock_27.0.6.tgz"; path = fetchurl { - name = "jest_mock___jest_mock_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.3.tgz"; - sha1 = "5591844f9192b3335c0dca38e8e45ed297d4d23d"; + name = "jest_mock___jest_mock_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.6.tgz"; + sha1 = "0efdd40851398307ba16778728f6d34d583e3467"; }; } { @@ -3002,99 +2994,99 @@ }; } { - name = "jest_regex_util___jest_regex_util_27.0.1.tgz"; + name = "jest_regex_util___jest_regex_util_27.0.6.tgz"; path = fetchurl { - name = "jest_regex_util___jest_regex_util_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz"; - sha1 = "69d4b1bf5b690faa3490113c47486ed85dd45b68"; + name = "jest_regex_util___jest_regex_util_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz"; + sha1 = "02e112082935ae949ce5d13b2675db3d8c87d9c5"; }; } { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.4.tgz"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.6.tgz"; path = fetchurl { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz"; - sha1 = "a07a242d70d668afd3fcf7f4270755eebb1fe579"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz"; + sha1 = "3e619e0ef391c3ecfcf6ef4056207a3d2be3269f"; }; } { - name = "jest_resolve___jest_resolve_27.0.4.tgz"; + name = "jest_resolve___jest_resolve_27.0.6.tgz"; path = fetchurl { - name = "jest_resolve___jest_resolve_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.4.tgz"; - sha1 = "8a27bc3f2f00c8ea28f3bc99bbf6f468300a703d"; + name = "jest_resolve___jest_resolve_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.6.tgz"; + sha1 = "e90f436dd4f8fbf53f58a91c42344864f8e55bff"; }; } { - name = "jest_runner___jest_runner_27.0.4.tgz"; + name = "jest_runner___jest_runner_27.0.6.tgz"; path = fetchurl { - name = "jest_runner___jest_runner_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.4.tgz"; - sha1 = "2787170a9509b792ae129794f6944d27d5d12a4f"; + name = "jest_runner___jest_runner_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.6.tgz"; + sha1 = "1325f45055539222bbc7256a6976e993ad2f9520"; }; } { - name = "jest_runtime___jest_runtime_27.0.4.tgz"; + name = "jest_runtime___jest_runtime_27.0.6.tgz"; path = fetchurl { - name = "jest_runtime___jest_runtime_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.4.tgz"; - sha1 = "2e4a6aa77cac32ac612dfe12768387a8aa15c2f0"; + name = "jest_runtime___jest_runtime_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.6.tgz"; + sha1 = "45877cfcd386afdd4f317def551fc369794c27c9"; }; } { - name = "jest_serializer___jest_serializer_27.0.1.tgz"; + name = "jest_serializer___jest_serializer_27.0.6.tgz"; path = fetchurl { - name = "jest_serializer___jest_serializer_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.1.tgz"; - sha1 = "2464d04dcc33fb71dc80b7c82e3c5e8a08cb1020"; + name = "jest_serializer___jest_serializer_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz"; + sha1 = "93a6c74e0132b81a2d54623251c46c498bb5bec1"; }; } { - name = "jest_snapshot___jest_snapshot_27.0.4.tgz"; + name = "jest_snapshot___jest_snapshot_27.0.6.tgz"; path = fetchurl { - name = "jest_snapshot___jest_snapshot_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.4.tgz"; - sha1 = "2b96e22ca90382b3e93bd0aae2ce4c78bf51fb5b"; + name = "jest_snapshot___jest_snapshot_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.6.tgz"; + sha1 = "f4e6b208bd2e92e888344d78f0f650bcff05a4bf"; }; } { - name = "jest_util___jest_util_27.0.2.tgz"; + name = "jest_util___jest_util_27.0.6.tgz"; path = fetchurl { - name = "jest_util___jest_util_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz"; - sha1 = "fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7"; + name = "jest_util___jest_util_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz"; + sha1 = "e8e04eec159de2f4d5f57f795df9cdc091e50297"; }; } { - name = "jest_validate___jest_validate_27.0.2.tgz"; + name = "jest_validate___jest_validate_27.0.6.tgz"; path = fetchurl { - name = "jest_validate___jest_validate_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.2.tgz"; - sha1 = "7fe2c100089449cd5cbb47a5b0b6cb7cda5beee5"; + name = "jest_validate___jest_validate_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.6.tgz"; + sha1 = "930a527c7a951927df269f43b2dc23262457e2a6"; }; } { - name = "jest_watcher___jest_watcher_27.0.2.tgz"; + name = "jest_watcher___jest_watcher_27.0.6.tgz"; path = fetchurl { - name = "jest_watcher___jest_watcher_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.2.tgz"; - sha1 = "dab5f9443e2d7f52597186480731a8c6335c5deb"; + name = "jest_watcher___jest_watcher_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.6.tgz"; + sha1 = "89526f7f9edf1eac4e4be989bcb6dec6b8878d9c"; }; } { - name = "jest_worker___jest_worker_27.0.2.tgz"; + name = "jest_worker___jest_worker_27.0.6.tgz"; path = fetchurl { - name = "jest_worker___jest_worker_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz"; - sha1 = "4ebeb56cef48b3e7514552f80d0d80c0129f0b05"; + name = "jest_worker___jest_worker_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz"; + sha1 = "a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed"; }; } { - name = "jest___jest_27.0.4.tgz"; + name = "jest___jest_27.0.6.tgz"; path = fetchurl { - name = "jest___jest_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-27.0.4.tgz"; - sha1 = "91d4d564b36bcf93b98dac1ab19f07089e670f53"; + name = "jest___jest_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-27.0.6.tgz"; + sha1 = "10517b2a628f0409087fbf473db44777d7a04505"; }; } { @@ -3786,11 +3778,11 @@ }; } { - name = "pretty_format___pretty_format_27.0.2.tgz"; + name = "pretty_format___pretty_format_27.0.6.tgz"; path = fetchurl { - name = "pretty_format___pretty_format_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.2.tgz"; - sha1 = "9283ff8c4f581b186b2d4da461617143dca478a4"; + name = "pretty_format___pretty_format_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz"; + sha1 = "ab770c47b2c6f893a21aefc57b75da63ef49a11f"; }; } { @@ -4682,11 +4674,11 @@ }; } { - name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_8.0.0.tgz"; path = fetchurl { - name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz"; - sha1 = "30898d1a7fa0c84d225a2c1434fb958f290883c1"; + name = "v8_to_istanbul___v8_to_istanbul_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz"; + sha1 = "4229f2a99e367f3f018fa1d5c2b8ec684667c69c"; }; } { @@ -4754,11 +4746,11 @@ }; } { - name = "whatwg_url___whatwg_url_8.6.0.tgz"; + name = "whatwg_url___whatwg_url_8.7.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz"; - sha1 = "27c0205a4902084b872aecb97cf0f2a7a3011f4c"; + name = "whatwg_url___whatwg_url_8.7.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz"; + sha1 = "656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"; }; } { @@ -4810,11 +4802,11 @@ }; } { - name = "ws___ws_7.5.0.tgz"; + name = "ws___ws_7.5.1.tgz"; path = fetchurl { - name = "ws___ws_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz"; - sha1 = "0033bafea031fb9df041b2026fc72a571ca44691"; + name = "ws___ws_7.5.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.1.tgz"; + sha1 = "44fc000d87edb1d9c53e51fbc69a0ac1f6871d66"; }; } { From f1e81de38c871c3ead9d85abcc29acaa254849b1 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Thu, 1 Jul 2021 10:17:45 +0000 Subject: [PATCH 13/75] =?UTF-8?q?grafanaPlugins.doitintl-bigquery-datasour?= =?UTF-8?q?ce:=202.0.1=20=E2=86=92=202.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grafana/plugins/doitintl-bigquery-datasource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix index f87526242b86..c5189720660a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "doitintl-bigquery-datasource"; - version = "2.0.1"; - zipHash = "sha256-tZyvER/rxL+mo2tgxFvwSIAmjFm/AnZ0RgvmD1YAE2U="; + version = "2.0.2"; + zipHash = "sha256-GE6DNuQ5WtS/2VmXbQBeRdVKDbLlLirWXW51i0RF6Cc="; meta = with lib; { description = "BigQuery DataSource for Grafana"; license = licenses.mit; From 505468f48d415dc1c6bbd1185411b3b7eeb135f5 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 30 Jun 2021 13:29:45 +0000 Subject: [PATCH 14/75] praat: 6.0.43 -> 6.1.50 --- pkgs/applications/audio/praat/default.nix | 30 +++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 239b62a40266..66a14fa05b28 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,30 +1,34 @@ -{ lib, stdenv, fetchurl, alsa-lib, gtk2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook, alsa-lib, gtk3, libpulseaudio }: stdenv.mkDerivation rec { pname = "praat"; - version = "6.0.43"; + version = "6.1.50"; - src = fetchurl { - url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "1l13bvnl7sv8v6s5z63201bhzavnj6bnqcj446akippsam13z4sf"; + src = fetchFromGitHub { + owner = "praat"; + repo = "praat"; + rev = "v${version}"; + sha256 = "11cw4292pml71hdnfy8y91blwyh45dyam1ywr09355zk44c5njpq"; }; configurePhase = '' - cp makefiles/makefile.defs.linux.alsa makefile.defs + cp makefiles/makefile.defs.linux.pulse makefile.defs ''; installPhase = '' - mkdir -p $out/bin - cp praat $out/bin + install -Dt $out/bin praat ''; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib gtk2 ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + buildInputs = [ alsa-lib gtk3 libpulseaudio ]; - meta = { + enableParallelBuilding = true; + + meta = with lib; { description = "Doing phonetics by computer"; homepage = "https://www.fon.hum.uva.nl/praat/"; - license = lib.licenses.gpl2Plus; # Has some 3rd-party code in it though - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; # Has some 3rd-party code in it though + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; }; } From a54bfd1ae0ea5c6a920407de96a3a82605eacd6b Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 2 Jul 2021 06:37:26 +0800 Subject: [PATCH 15/75] papirus-icon-theme: 20210601 -> 20210701 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index e7543aff6668..adc2c5fb197c 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210601"; + version = "20210701"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-AX51udzIv/DO0n8ba2Gm6Leikep6x4tgUuRUdPX/Cds="; + sha256 = "sha256-eqSZBcypwnNX92SGG17MWlnsVzk0jOTdjtEaWMbQsMs="; }; nativeBuildInputs = [ gtk3 ]; From fe28c6aed6b9108c656c16fcb85e2e63ecfb4010 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Fri, 2 Jul 2021 00:34:26 -0600 Subject: [PATCH 16/75] khal: disable failing tests and cleanup test logic Closes #128751 --- pkgs/applications/misc/khal/default.nix | 28 +++++++--------- .../misc/khal/skip-broken-test.patch | 33 ------------------- 2 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 pkgs/applications/misc/khal/skip-broken-test.patch diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 5c6b505dd683..ab333c4f798d 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -9,10 +9,6 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "sha256-L92PwU/ll+Wn1unGPHho2WC07QIbVjxoSnHwcJDtpDI="; }; - patches = [ - ./skip-broken-test.patch - ]; - propagatedBuildInputs = [ atomicwrites click @@ -31,16 +27,12 @@ with python3.pkgs; buildPythonApplication rec { freezegun ]; nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed ]; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ + glibcLocales + pytestCheckHook + ]; LC_ALL = "en_US.UTF-8"; - postPatch = '' - sed -i \ - -e "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" \ - -e "s/Invalid value for \"\[ICS\]\"/Invalid value for \\\'\[ICS\]\\\'/" \ - tests/cli_test.py - ''; - postInstall = '' # zsh completion install -D misc/__khal $out/share/zsh/site-functions/__khal @@ -56,11 +48,13 @@ with python3.pkgs; buildPythonApplication rec { doCheck = !stdenv.isAarch64; - checkPhase = '' - py.test -k "not test_vertical_month_abbr_fr and not test_vertical_month_unicode_weekdeays_gr \ - and not test_event_different_timezones and not test_default_calendar and not test_birthdays \ - and not test_birthdays_no_year" - ''; + disabledTests = [ + # This test is failing due to https://github.com/pimutils/khal/issues/1065 + "test_print_ics_command" + + # Mocking breaks in this testcase + "test_import_from_stdin" + ]; meta = with lib; { homepage = "http://lostpackets.de/khal/"; diff --git a/pkgs/applications/misc/khal/skip-broken-test.patch b/pkgs/applications/misc/khal/skip-broken-test.patch deleted file mode 100644 index fc37f6acc86e..000000000000 --- a/pkgs/applications/misc/khal/skip-broken-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/tests/cli_test.py b/tests/cli_test.py -index 5e354a5..d8fbcd5 100644 ---- a/tests/cli_test.py -+++ b/tests/cli_test.py -@@ -493,6 +493,7 @@ def test_import_invalid_choice_and_prefix(runner): - assert result.output == '09.04.-09.04. An Event\n' - - -+@pytest.mark.skip(reason="Mocking breaks in this testcase") - def test_import_from_stdin(runner, monkeypatch): - ics_data = 'This is some really fake icalendar data' - -diff --git a/tests/ui/test_editor.py b/tests/ui/test_editor.py -index 27b7fa5..5978d72 100644 ---- a/tests/ui/test_editor.py -+++ b/tests/ui/test_editor.py -@@ -1,5 +1,7 @@ - import datetime as dt - -+import pytest -+ - import icalendar - from khal.ui.editor import RecurrenceEditor, StartEndEditor - -@@ -19,7 +21,7 @@ palette = { - 'edit': 'blue', - } - -- -+@pytest.mark.skip(reason="Mocking breaks in this testcase") - def test_popup(monkeypatch): - """making sure the popup calendar gets callend with the right inital value - From fa55cb1af8720b0976cf62119fc2474ca8aa4bed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 11:50:59 +0200 Subject: [PATCH 17/75] python3Packages.python-gitlab: 2.8.0 -> 2.9.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 34fbcff42f13..9d06569dfdc3 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.8.0"; + version = "2.9.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f3364a8d1e813a0b3e68485db1e1881d8653b0e03b9a41f2c59544fce4930101"; + sha256 = "sha256-LFGxTN2aaAKDFaKw6IUl03YJZziPmfqlfeiQK0VGW+Y="; }; propagatedBuildInputs = [ From 6b87fefda5ba49612e56382152e2876fd589390c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 13:55:34 +0200 Subject: [PATCH 18/75] python3Packages.ibm-cloud-sdk-core: fix build --- .../python-modules/ibm-cloud-sdk-core/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 973b792f5bc8..a63617ba2a2a 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -38,9 +38,17 @@ buildPythonPackage rec { # Various tests try to access credential files which are not included with the source distribution disabledTests = [ - "test_iam" "test_cwd" "test_configure_service" "test_get_authenticator" - "test_read_external_sources_2" "test_files_duplicate_parts" "test_files_list" - "test_files_dict" "test_retry_config_external" "test_gzip_compression_external" + "test_configure_service" + "test_cp4d_authenticator" + "test_cwd" + "test_files_dict" + "test_files_duplicate_parts" + "test_files_list" + "test_get_authenticator" + "test_gzip_compression_external" + "test_iam" + "test_read_external_sources_2" + "test_retry_config_external" ]; meta = with lib; { From 1617f79af1da89c810649b6c88290c1bcc7c4312 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 14:00:49 +0200 Subject: [PATCH 19/75] python3Packages.ibm-watson: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/ibm-watson/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 7684f1a689cb..3698d8b2e368 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "1abink5mv9nw506nwm9hlvnr1lq6dkxxj2j12iwphcyd7xs63n2s"; + sha256 = "sha256-0F4BZf0D0dqGm0OkJaSgmH5RxEA8KCzOlbnhIQVsgzQ="; }; checkInputs = [ @@ -40,8 +40,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace websocket-client==0.48.0 websocket-client>=0.48.0 \ - --replace ibm_cloud_sdk_core==3.3.6 ibm_cloud_sdk_core>=3.3.6 + --replace websocket-client==1.1.0 websocket-client>=1.1.0 ''; meta = with lib; { From 56259a303f63804b26ad0124c0cd51579d07b875 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 14:17:13 +0200 Subject: [PATCH 20/75] python3Packages.pyatv: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/pyatv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index cf7fd53d1657..cef64c084f2f 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "1slr6l0gw0mf1zhp40bjf5bib45arw1cy4fqkg0gvdk1hx79828m"; + sha256 = "sha256-/ccmYNOYE+RkJiJbGkQgdYE8/X4xzyRT4dkMa/qSZEc="; }; postPatch = '' From 1ec565191387e1ed6dc5c7a355cdf58a2b56336a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Jul 2021 13:37:24 +0200 Subject: [PATCH 21/75] treewide: use pythonPackages.python-dateutil instead of pythonPackages.dateutil --- doc/languages-frameworks/python.section.md | 6 +++--- pkgs/applications/audio/picard/default.nix | 2 +- pkgs/applications/gis/grass/default.nix | 2 +- pkgs/applications/gis/qgis/unwrapped.nix | 2 +- .../graphics/rapid-photo-downloader/default.nix | 2 +- pkgs/applications/misc/calibre/default.nix | 2 +- pkgs/applications/misc/gcalcli/default.nix | 2 +- pkgs/applications/misc/khal/default.nix | 2 +- pkgs/applications/misc/pdfarranger/default.nix | 2 +- pkgs/applications/misc/termdown/default.nix | 4 ++-- pkgs/applications/misc/visidata/default.nix | 4 ++-- pkgs/applications/misc/yokadi/default.nix | 4 ++-- pkgs/applications/networking/cluster/luigi/default.nix | 2 +- .../networking/feedreaders/gnome-feeds/default.nix | 2 +- pkgs/applications/networking/flexget/default.nix | 2 +- pkgs/applications/networking/giara/default.nix | 2 +- .../instant-messengers/salut-a-toi/requirements.nix | 2 +- pkgs/applications/networking/sync/acd_cli/default.nix | 4 ++-- pkgs/applications/networking/syncthing-gtk/default.nix | 4 ++-- pkgs/applications/office/paperless/default.nix | 2 +- pkgs/applications/office/paperwork/paperwork-gtk.nix | 2 +- pkgs/applications/office/pyspread/default.nix | 2 +- pkgs/applications/office/tryton/default.nix | 2 +- pkgs/applications/science/math/caffe/default.nix | 2 +- pkgs/applications/video/pyca/default.nix | 4 ++-- pkgs/applications/window-managers/qtile/default.nix | 2 +- pkgs/development/python-modules/Nikola/default.nix | 4 ++-- pkgs/development/python-modules/adal/default.nix | 4 ++-- pkgs/development/python-modules/alembic/default.nix | 4 ++-- pkgs/development/python-modules/aniso8601/default.nix | 4 ++-- pkgs/development/python-modules/azure-storage/default.nix | 4 ++-- pkgs/development/python-modules/beancount/default.nix | 4 ++-- .../python-modules/bitcoin-price-api/default.nix | 4 ++-- pkgs/development/python-modules/botocore/default.nix | 4 ++-- pkgs/development/python-modules/bugwarrior/default.nix | 4 ++-- pkgs/development/python-modules/buildbot/default.nix | 4 ++-- pkgs/development/python-modules/certbot/default.nix | 4 ++-- pkgs/development/python-modules/clize/default.nix | 4 ++-- pkgs/development/python-modules/clldutils/default.nix | 4 ++-- pkgs/development/python-modules/cloudsmith-api/default.nix | 4 ++-- pkgs/development/python-modules/csvw/default.nix | 4 ++-- pkgs/development/python-modules/datashape/default.nix | 4 ++-- pkgs/development/python-modules/dateparser/0.x.nix | 4 ++-- pkgs/development/python-modules/dateparser/default.nix | 4 ++-- pkgs/development/python-modules/django-haystack/default.nix | 4 ++-- pkgs/development/python-modules/django_silk/default.nix | 4 ++-- pkgs/development/python-modules/fake_factory/default.nix | 4 ++-- pkgs/development/python-modules/faker/default.nix | 4 ++-- pkgs/development/python-modules/feedgen/default.nix | 4 ++-- pkgs/development/python-modules/fitbit/default.nix | 4 ++-- .../python-modules/flask-jwt-extended/default.nix | 4 ++-- pkgs/development/python-modules/freezegun/0.3.nix | 4 ++-- pkgs/development/python-modules/freezegun/default.nix | 4 ++-- pkgs/development/python-modules/gdrivefs/default.nix | 4 ++-- pkgs/development/python-modules/ghp-import/default.nix | 4 ++-- pkgs/development/python-modules/github3_py/default.nix | 4 ++-- pkgs/development/python-modules/google-apputils/default.nix | 4 ++-- pkgs/development/python-modules/guessit/default.nix | 4 ++-- pkgs/development/python-modules/holidays/default.nix | 4 ++-- pkgs/development/python-modules/hypchat/default.nix | 4 ++-- pkgs/development/python-modules/icalendar/default.nix | 4 ++-- pkgs/development/python-modules/influxdb/default.nix | 4 ++-- pkgs/development/python-modules/ipyparallel/default.nix | 4 ++-- pkgs/development/python-modules/javaproperties/default.nix | 4 ++-- pkgs/development/python-modules/jupyter_client/5.nix | 4 ++-- pkgs/development/python-modules/jupyter_client/default.nix | 4 ++-- pkgs/development/python-modules/jupyterhub/default.nix | 4 ++-- pkgs/development/python-modules/koji/default.nix | 4 ++-- pkgs/development/python-modules/mailman-rss/default.nix | 2 +- pkgs/development/python-modules/matplotlib/2.nix | 4 ++-- pkgs/development/python-modules/matplotlib/default.nix | 4 ++-- pkgs/development/python-modules/nipype/default.nix | 4 ++-- pkgs/development/python-modules/oci/default.nix | 4 ++-- pkgs/development/python-modules/owslib/default.nix | 4 ++-- pkgs/development/python-modules/pandas/2.nix | 6 +++--- pkgs/development/python-modules/pandas/default.nix | 4 ++-- pkgs/development/python-modules/pelican/default.nix | 4 ++-- pkgs/development/python-modules/pendulum/default.nix | 4 ++-- pkgs/development/python-modules/prov/default.nix | 4 ++-- pkgs/development/python-modules/pwntools/default.nix | 4 ++-- pkgs/development/python-modules/pycollada/default.nix | 4 ++-- pkgs/development/python-modules/pyflick/default.nix | 4 ++-- pkgs/development/python-modules/pykeepass/default.nix | 4 ++-- pkgs/development/python-modules/pykwalify/default.nix | 4 ++-- pkgs/development/python-modules/pync/default.nix | 4 ++-- pkgs/development/python-modules/pysaml2/default.nix | 4 ++-- pkgs/development/python-modules/pytomlpp/default.nix | 4 ++-- pkgs/development/python-modules/rainbowstream/default.nix | 4 ++-- pkgs/development/python-modules/sipsimple/default.nix | 4 ++-- .../development/python-modules/sqlalchemy-utils/default.nix | 4 ++-- pkgs/development/python-modules/suseapi/default.nix | 4 ++-- pkgs/development/python-modules/taskw/default.nix | 4 ++-- pkgs/development/python-modules/trytond/default.nix | 4 ++-- pkgs/development/python-modules/urllib3/2.nix | 4 ++-- pkgs/development/python-modules/urllib3/default.nix | 4 ++-- pkgs/development/python-modules/vertica-python/default.nix | 4 ++-- pkgs/development/python-modules/vobject/default.nix | 4 ++-- pkgs/development/python-modules/webdavclient3/default.nix | 4 ++-- pkgs/development/python-modules/weboob/default.nix | 4 ++-- pkgs/development/python-modules/woob/default.nix | 4 ++-- pkgs/development/tools/build-managers/conan/default.nix | 2 +- pkgs/development/tools/remarshal/default.nix | 2 +- pkgs/misc/pylode/default.nix | 2 +- pkgs/servers/ldap/389/default.nix | 2 +- pkgs/servers/mail/mailman/hyperkitty.nix | 4 ++-- pkgs/servers/web-apps/searx/default.nix | 2 +- pkgs/tools/admin/awslogs/default.nix | 2 +- pkgs/tools/admin/oci-cli/default.nix | 2 +- pkgs/tools/backup/tarsnapper/default.nix | 2 +- pkgs/tools/filesystems/ceph/default.nix | 2 +- pkgs/tools/misc/barman/default.nix | 4 ++-- pkgs/tools/misc/pdd/default.nix | 4 ++-- pkgs/tools/misc/pubs/default.nix | 2 +- pkgs/tools/networking/cloud-custodian/default.nix | 4 ++-- pkgs/tools/networking/s3cmd/default.nix | 4 ++-- .../package-management/nixops/azure-storage/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 117 files changed, 205 insertions(+), 205 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 54face47d1ed..847a41cf23c3 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -439,7 +439,7 @@ The following example shows which arguments are given to `buildPythonPackage` in order to build [`datashape`](https://github.com/blaze/datashape). ```nix -{ lib, buildPythonPackage, fetchPypi, numpy, multipledispatch, dateutil, pytest }: +{ lib, buildPythonPackage, fetchPypi, numpy, multipledispatch, python-dateutil, pytest }: buildPythonPackage rec { pname = "datashape"; @@ -451,7 +451,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + propagatedBuildInputs = [ numpy multipledispatch python-dateutil ]; meta = with lib; { homepage = "https://github.com/ContinuumIO/datashape"; @@ -463,7 +463,7 @@ buildPythonPackage rec { ``` We can see several runtime dependencies, `numpy`, `multipledispatch`, and -`dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a +`python-dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a test runner and is only used during the `checkPhase` and is therefore not added to `propagatedBuildInputs`. diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 49aa0ba47147..dc030cc708b5 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -40,7 +40,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ chromaprint - dateutil + python-dateutil discid fasteners mutagen diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index ef7458d7394c..09c1fddbda21 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid ] - ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); + ++ (with python2Packages; [ python python-dateutil wxPython30 numpy ]); # On Darwin the installer tries to symlink the help files into a system # directory diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 2ebe0ac253fe..3ed11aa8b706 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -12,7 +12,7 @@ let numpy psycopg2 chardet - dateutil + python-dateutil pyyaml pytz requests diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 9fd629ca8e9c..f9120ca0ee48 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -55,7 +55,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { psutil pyxdg arrow - dateutil + python-dateutil easygui colour pymediainfo diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0ee374ac6957..d27c9c9af653 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -77,7 +77,7 @@ mkDerivation rec { cchardet css-parser cssselect - dateutil + python-dateutil dnspython feedparser html2text diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 392e2c312f7d..23e42539d799 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - dateutil gflags httplib2 parsedatetime six vobject + python-dateutil gflags httplib2 parsedatetime six vobject google-api-python-client oauth2client uritemplate libnotify ]; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 5c6b505dd683..a0b477e985cb 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -18,7 +18,7 @@ with python3.pkgs; buildPythonApplication rec { click click-log configobj - dateutil + python-dateutil icalendar lxml pkgs.vdirsyncer diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 235d14b4cdad..5657c7f7e1a5 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { pikepdf img2pdf setuptools - dateutil + python-dateutil ]; # incompatible with wrapGAppsHook diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index 562a0f0bdcbe..f28bd665a5e1 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -3,7 +3,7 @@ , buildPythonApplication , click , pyfiglet -, dateutil +, python-dateutil , setuptools }: @@ -18,7 +18,7 @@ buildPythonApplication rec { owner = "trehn"; }; - propagatedBuildInputs = [ dateutil click pyfiglet setuptools ]; + propagatedBuildInputs = [ python-dateutil click pyfiglet setuptools ]; meta = with lib; { description = "Starts a countdown to or from TIMESPEC"; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 9663d09304f8..7851000a7a0f 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -2,7 +2,7 @@ , lib , buildPythonApplication , fetchFromGitHub -, dateutil +, python-dateutil , pandas , requests , lxml @@ -36,7 +36,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ # from visidata/requirements.txt # packages not (yet) present in nixpkgs are commented - dateutil + python-dateutil pandas requests lxml diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index 20defe419880..10d519efa45c 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonApplication, dateutil, +{ lib, fetchurl, buildPythonApplication, python-dateutil, sqlalchemy, setproctitle, icalendar }: buildPythonApplication rec { @@ -11,7 +11,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil sqlalchemy setproctitle icalendar diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index ef85494bd140..2c839e84a4e6 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; }; - propagatedBuildInputs = with python3.pkgs; [ dateutil tornado python-daemon boto3 ]; + propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index 62ffe15e6183..9b173e856827 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 - dateutil + python-dateutil feedparser html5lib listparser diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 228c6b471509..61e42ce22ec1 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { pynzb pyparsing PyRSS2Gen - dateutil + python-dateutil pyyaml rebulk requests diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix index 940756855b99..1f4d2e0a2d90 100644 --- a/pkgs/applications/networking/giara/default.nix +++ b/pkgs/applications/networking/giara/default.nix @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { pythonPath = with python3.pkgs; [ pygobject3 pycairo - dateutil + python-dateutil praw pillow mistune diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix index 8277028ac7b8..a8e711c447d5 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix @@ -55,7 +55,7 @@ in { sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; }; - propagatedBuildInputs = with pythonPackages; [twisted dateutil]; + propagatedBuildInputs = with pythonPackages; [twisted python-dateutil]; meta = with lib; { description = "Some (mainly XMPP-related) additions to twisted"; diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index 519242b887cc..f630cb4071a4 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonApplication, fuse -, appdirs, colorama, dateutil, requests, requests_toolbelt +, appdirs, colorama, python-dateutil, requests, requests_toolbelt , fusepy, sqlalchemy, setuptools }: buildPythonApplication rec { @@ -15,7 +15,7 @@ buildPythonApplication rec { sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp"; }; - propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests + propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests requests_toolbelt setuptools sqlalchemy ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 158999f86fee..caa46942ca92 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook -, gnome, buildPythonApplication, dateutil, pyinotify, pygobject3 +, gnome, buildPythonApplication, python-dateutil, pyinotify, pygobject3 , bcrypt, gobject-introspection, gsettings-desktop-schemas , pango, gdk-pixbuf, atk }: @@ -30,7 +30,7 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ - dateutil pyinotify pygobject3 bcrypt + python-dateutil pyinotify pygobject3 bcrypt ]; patches = [ diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index c2578696c688..68032ebe8497 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -122,7 +122,7 @@ let runtimePackages = with python.pkgs; [ dateparser - dateutil + python-dateutil django django-cors-headers django-crispy-forms diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 8f1278d99266..16ee7733ed26 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -122,7 +122,7 @@ python3Packages.buildPythonApplication rec { openpaperwork-core pypillowfight pyxdg - dateutil + python-dateutil setuptools ]; diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix index 54d3b8f5c3e2..3c68c19aa97c 100644 --- a/pkgs/applications/office/pyspread/default.nix +++ b/pkgs/applications/office/pyspread/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - dateutil + python-dateutil markdown2 matplotlib numpy diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index b3a5ae44c936..ff4835411ef5 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ - dateutil + python-dateutil pygobject3 goocalendar pycairo diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 565c6a17672d..08bf84be7c89 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { let pp = python.pkgs; in ([ pp.numpy pp.scipy pp.scikitimage pp.h5py pp.matplotlib pp.ipython pp.networkx pp.nose - pp.pandas pp.dateutil pp.protobuf pp.gflags + pp.pandas pp.python-dateutil pp.protobuf pp.gflags pp.pyyaml pp.pillow pp.six ] ++ lib.optional leveldbSupport pp.leveldb) ); diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index df42bbec156f..d7e1e03733c2 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: +{ lib, buildPythonApplication, fetchFromGitHub, pycurl, python-dateutil, configobj, sqlalchemy, sdnotify, flask }: buildPythonApplication rec { pname = "pyca"; @@ -13,7 +13,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pycurl - dateutil + python-dateutil configobj sqlalchemy sdnotify diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index ba7228f5b961..08b3a9834b6a 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -39,7 +39,7 @@ python37Packages.buildPythonApplication rec { cairocffi-xcffib setuptools setuptools-scm - dateutil + python-dateutil dbus-python mpd2 psutil diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 17a6e4d6a899..ae18ce5dc319 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -3,7 +3,7 @@ , Babel , blinker , buildPythonPackage -, dateutil +, python-dateutil , docutils , doit , fetchPypi @@ -53,7 +53,7 @@ buildPythonPackage rec { aiohttp Babel blinker - dateutil + python-dateutil docutils doit ghp-import diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 31e0e73016cd..b555188b4b5c 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, requests, pyjwt, dateutil }: +, requests, pyjwt, python-dateutil }: buildPythonPackage rec { pname = "adal"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "d74f45b81317454d96e982fd1c50e6fb5c99ac2223728aea8764433a39f566f1"; }; - propagatedBuildInputs = [ requests pyjwt dateutil ]; + propagatedBuildInputs = [ requests pyjwt python-dateutil ]; meta = with lib; { description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index c820ee81ee2a..81502a470a68 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, coverage, setuptools -, Mako, sqlalchemy, python-editor, dateutil +, Mako, sqlalchemy, python-editor, python-dateutil }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest pytestcov mock coverage ]; - propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil setuptools ]; + propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; # no traditional test suite doCheck = false; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 9cc3fb827755..62db58d611e4 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , fetchPypi , isPy3k , mock @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil ]; checkInputs = [ diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix index 8afb9b751ee9..3bc6a7318665 100644 --- a/pkgs/development/python-modules/azure-storage/default.nix +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -5,7 +5,7 @@ , azure-common , cryptography , futures ? null -, dateutil +, python-dateutil , requests , isPy3k }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; }; - propagatedBuildInputs = [ azure-common cryptography dateutil requests ] + propagatedBuildInputs = [ azure-common cryptography python-dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postPatch = '' diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index ec864e71498f..31f8a24d8b76 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -5,7 +5,7 @@ , beautifulsoup4 , bottle , chardet -, dateutil +, python-dateutil , google-api-python-client , google-auth-oauthlib , lxml @@ -34,7 +34,7 @@ buildPythonPackage rec { beautifulsoup4 bottle chardet - dateutil + python-dateutil google-api-python-client google-auth-oauthlib lxml diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix index 3e74c17f3be8..c9d317a81c3c 100644 --- a/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, dateutil, requests }: +, python-dateutil, requests }: buildPythonPackage rec { pname = "bitcoin-price-api"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "bc68076f9632aaa9a8009d916d67a709c1e045dd904cfc7a3e8be33960d32029"; }; - propagatedBuildInputs = [ dateutil requests ]; + propagatedBuildInputs = [ python-dateutil requests ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 8a21eb455e0d..d05c2decf497 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , jmespath , docutils , ordereddict @@ -21,7 +21,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil jmespath docutils ordereddict diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index c59d2196d207..a29e7458d4b5 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools -, twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six +, twiggy, requests, offtrac, bugzilla, taskw, python-dateutil, pytz, keyring, six , jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools - twiggy requests offtrac bugzilla taskw dateutil pytz keyring six + twiggy requests offtrac bugzilla taskw python-dateutil pytz keyring six jinja2 pycurl dogpile_cache lockfile click pyxdg future jira ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 043a1cd3e136..65919542057b 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, sqlalchemy, - sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, + sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh, glibcLocales, ldap3, nixosTests }: @@ -39,7 +39,7 @@ let zope_interface sqlalchemy sqlalchemy_migrate - dateutil + python-dateutil txaio autobahn pyjwt diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 0f6b5fa28594..7c324e646a4d 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, gnureadline -, pytest_xdist, pytestCheckHook, dateutil +, pytest_xdist, pytestCheckHook, python-dateutil }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { buildInputs = [ dialog gnureadline ]; checkInputs = [ - dateutil + python-dateutil pytestCheckHook pytest_xdist ]; diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 1418db69a393..0088acdb832c 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , sigtools , six , attrs @@ -29,7 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - dateutil + python-dateutil pygments repeated_test unittest2 diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 318354786b56..563ad08381c4 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -5,7 +5,7 @@ , attrs , colorlog , csvw -, dateutil +, python-dateutil , tabulate , mock , postgresql @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - dateutil + python-dateutil tabulate colorlog attrs diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 57316ae9d6ce..5c3b5f114f53 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -3,7 +3,7 @@ , fetchPypi , certifi , six -, dateutil +, python-dateutil , urllib3 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi six - dateutil + python-dateutil urllib3 ]; diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 27f3f291113c..67342d9eccc8 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -4,7 +4,7 @@ , pythonOlder , attrs , isodate -, dateutil +, python-dateutil , rfc3986 , uritemplate , mock @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs isodate - dateutil + python-dateutil rfc3986 uritemplate ]; diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 6f11ae62c3e9..50bde25cf444 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -5,7 +5,7 @@ , mock , numpy , multipledispatch -, dateutil +, python-dateutil }: let @@ -29,7 +29,7 @@ in buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + propagatedBuildInputs = [ numpy multipledispatch python-dateutil ]; # Disable several tests # https://github.com/blaze/datashape/issues/232 diff --git a/pkgs/development/python-modules/dateparser/0.x.nix b/pkgs/development/python-modules/dateparser/0.x.nix index 49e2d1f2796e..2aab262e64d2 100644 --- a/pkgs/development/python-modules/dateparser/0.x.nix +++ b/pkgs/development/python-modules/dateparser/0.x.nix @@ -4,7 +4,7 @@ , mock , parameterized , pytestCheckHook -, dateutil +, python-dateutil , pytz , regex , tzlocal @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ # install_requires - dateutil pytz regex tzlocal + python-dateutil pytz regex tzlocal # extra_requires convertdate umalqurra jdatetime ruamel_yaml ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 21dcffc4a841..6cbd1df32a57 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy3k , fetchFromGitHub -, dateutil +, python-dateutil , pytz , regex , tzlocal @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ # install_requires - dateutil pytz regex tzlocal + python-dateutil pytz regex tzlocal # extra_requires hijri-converter convertdate ]; diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 2c678e672a3e..14e66a159c18 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools, setuptools-scm, django, dateutil, whoosh, pysolr +, setuptools, setuptools-scm, django, python-dateutil, whoosh, pysolr , coverage, mock, nose, geopy, requests }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "d490f920afa85471dd1fa5000bc8eff4b704daacbe09aee1a64e75cbc426f3be"; }; - checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ]; + checkInputs = [ pysolr whoosh python-dateutil geopy coverage nose mock coverage requests ]; propagatedBuildInputs = [ django setuptools ]; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index b1d4eaec5c9a..3af74be85b27 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -7,7 +7,7 @@ , django , pygments , simplejson -, dateutil +, python-dateutil , requests , setuptools-scm , sqlparse @@ -56,7 +56,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ mock ]; propagatedBuildInputs = [ - django pygments simplejson dateutil requests + django pygments simplejson python-dateutil requests sqlparse jinja2 autopep8 pytz pillow gprof2dot ]; diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix index 2e561a163ab5..002df15177bd 100644 --- a/pkgs/development/python-modules/fake_factory/default.nix +++ b/pkgs/development/python-modules/fake_factory/default.nix @@ -3,7 +3,7 @@ , fetchPypi , python , six -, dateutil +, python-dateutil , ipaddress , mock }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "f5bd18deb22ad8cb4402513c025877bc6b50de58902d686b6b21ba8981dce260"; }; - propagatedBuildInputs = [ six dateutil ipaddress mock ]; + propagatedBuildInputs = [ six python-dateutil ipaddress mock ]; # fake-factory is depreciated and single test will always fail doCheck = false; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 12f30b20a42b..196c7e47b399 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , text-unidecode , freezegun , pytestCheckHook @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil text-unidecode ]; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 59ca95a0338a..9ca3627e74ca 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, lxml }: +{ lib, buildPythonPackage, fetchPypi, python-dateutil, lxml }: buildPythonPackage rec { pname = "feedgen"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0jl0b87l7v6c0f1nx6k81skjhdj5i11kmchdjls00mynpvdip0cf"; }; - propagatedBuildInputs = [ dateutil lxml ]; + propagatedBuildInputs = [ python-dateutil lxml ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index 46c6ac78a6c4..b41ac0a4983a 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , coverage -, dateutil +, python-dateutil , freezegun , mock , requests-mock @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.3.1"; checkInputs = [ coverage freezegun mock requests-mock sphinx ]; - propagatedBuildInputs = [ dateutil requests_oauthlib ]; + propagatedBuildInputs = [ python-dateutil requests_oauthlib ]; # The source package on PyPi is missing files required for unit testing. # https://github.com/orcasgit/python-fitbit/issues/148 diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index d58ae4310398..7057bb587503 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: +{ lib, buildPythonPackage, fetchPypi, python-dateutil, flask, pyjwt, werkzeug, pytest }: buildPythonPackage rec { pname = "Flask-JWT-Extended"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "76461f2dbdf502261c69ddecd858eaf4164fbcfbf05aa456f3927fc2ab0315de"; }; - propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ]; + propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/freezegun/0.3.nix b/pkgs/development/python-modules/freezegun/0.3.nix index a83a432d89dc..c4444805009d 100644 --- a/pkgs/development/python-modules/freezegun/0.3.nix +++ b/pkgs/development/python-modules/freezegun/0.3.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, dateutil +, python-dateutil , six , mock , nose @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; }; - propagatedBuildInputs = [ dateutil six ]; + propagatedBuildInputs = [ python-dateutil six ]; checkInputs = [ mock nose pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 00d03435de9d..742506b6089d 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi -, dateutil +, python-dateutil , pytestCheckHook }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3"; }; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; checkInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix index 836fdee4bebd..41b6a6a87f19 100644 --- a/pkgs/development/python-modules/gdrivefs/default.nix +++ b/pkgs/development/python-modules/gdrivefs/default.nix @@ -6,7 +6,7 @@ , greenlet , httplib2 , six -, dateutil +, python-dateutil , fusepy , google-api-python-client }: @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = [ gipc greenlet httplib2 six ]; - propagatedBuildInputs = [ dateutil fusepy google-api-python-client ]; + propagatedBuildInputs = [ python-dateutil fusepy google-api-python-client ]; patchPhase = '' substituteInPlace gdrivefs/resources/requirements.txt \ diff --git a/pkgs/development/python-modules/ghp-import/default.nix b/pkgs/development/python-modules/ghp-import/default.nix index 37a35febdf03..0d5506009a75 100644 --- a/pkgs/development/python-modules/ghp-import/default.nix +++ b/pkgs/development/python-modules/ghp-import/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-wiqc4Qw3dT4miNFk12WnANrkuNefptsKLDEyuniBiU8="; }; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; # Does not include any unit tests doCheck = false; diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index 8a1eea40c682..68e277d0b1a5 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -9,7 +9,7 @@ , mock , requests , uritemplate -, dateutil +, python-dateutil , jwcrypto , pyopenssl , ndg-httpsclient @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ betamax pytest betamax-matchers ] ++ lib.optional (pythonOlder "3") unittest2 ++ lib.optional (pythonOlder "3.3") mock; - propagatedBuildInputs = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; + propagatedBuildInputs = [ requests uritemplate python-dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; postPatch = '' sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py diff --git a/pkgs/development/python-modules/google-apputils/default.nix b/pkgs/development/python-modules/google-apputils/default.nix index 321837f56aec..225adf348d1a 100644 --- a/pkgs/development/python-modules/google-apputils/default.nix +++ b/pkgs/development/python-modules/google-apputils/default.nix @@ -4,7 +4,7 @@ , isPy3k , pytz , gflags -, dateutil +, python-dateutil , mox , python }: @@ -23,7 +23,7 @@ buildPythonPackage rec { sed -i '/ez_setup/d' setup.py ''; - propagatedBuildInputs = [ pytz gflags dateutil mox ]; + propagatedBuildInputs = [ pytz gflags python-dateutil mox ]; checkPhase = '' ${python.executable} setup.py google_test diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 0450dfd07e58..adb131868c7c 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestrunner -, dateutil +, python-dateutil , babelfish , rebulk }: @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ pytestrunner ]; propagatedBuildInputs = [ - dateutil babelfish rebulk + python-dateutil babelfish rebulk ]; meta = { diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index fe362fa86da8..e09b957425a8 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , convertdate -, dateutil +, python-dateutil , fetchPypi , hijri-converter , korean-lunar-calendar @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ convertdate - dateutil + python-dateutil hijri-converter korean-lunar-calendar six diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix index 8337fd2230ba..1f69dfe21062 100644 --- a/pkgs/development/python-modules/hypchat/default.nix +++ b/pkgs/development/python-modules/hypchat/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi -, requests, six, dateutil }: +, requests, six, python-dateutil }: buildPythonPackage rec { pname = "hypchat"; @@ -10,5 +10,5 @@ buildPythonPackage rec { sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg"; }; - propagatedBuildInputs = [ requests six dateutil ]; + propagatedBuildInputs = [ requests six python-dateutil ]; } diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 8e75a945d10c..fdf490e7cb2d 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools -, dateutil +, python-dateutil , pytz }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools ]; - propagatedBuildInputs = [ dateutil pytz ]; + propagatedBuildInputs = [ python-dateutil pytz ]; meta = with lib; { description = "A parser/generator of iCalendar files"; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 6b3a46ea3915..3b9672701833 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , fetchFromGitHub , fetchpatch , mock @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests - dateutil + python-dateutil pytz six msgpack diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 2c5692bf26a9..cc5957d29733 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , nose -, dateutil +, python-dateutil , ipython_genutils , decorator , pyzmq @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - propagatedBuildInputs = [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado + propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado ] ++ lib.optionals (!isPy3k) [ futures ]; # Requires access to cluster diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index dd3c027bca20..348d83e11059 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub , six , pytest -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ dateutil pytest ]; + checkInputs = [ python-dateutil pytest ]; checkPhase = '' rm tox.ini pytest -k 'not dumps and not time' --ignore=test/test_propclass.py diff --git a/pkgs/development/python-modules/jupyter_client/5.nix b/pkgs/development/python-modules/jupyter_client/5.nix index 201fbec02ca5..e4e77cf47510 100644 --- a/pkgs/development/python-modules/jupyter_client/5.nix +++ b/pkgs/development/python-modules/jupyter_client/5.nix @@ -4,7 +4,7 @@ , traitlets , jupyter_core , pyzmq -, dateutil +, python-dateutil , isPyPy , py , tornado @@ -23,7 +23,7 @@ buildPythonPackage rec { traitlets jupyter_core pyzmq - dateutil + python-dateutil tornado ] ++ lib.optional isPyPy py; diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 5f534557a9ad..fbc37c3f581b 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -4,7 +4,7 @@ , traitlets , jupyter_core , pyzmq -, dateutil +, python-dateutil , isPyPy , py , tornado @@ -23,7 +23,7 @@ buildPythonPackage rec { traitlets jupyter_core pyzmq - dateutil + python-dateutil tornado ] ++ lib.optional isPyPy py; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 108d11853f05..904cd7df0c2a 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -7,7 +7,7 @@ , alembic , async_generator , certipy -, dateutil +, python-dateutil , entrypoints , jinja2 , jupyter-telemetry @@ -115,7 +115,7 @@ buildPythonPackage rec { alembic async_generator certipy - dateutil + python-dateutil entrypoints jinja2 jupyter-telemetry diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 5f560be4e887..cd3b5ff62c26 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }: +{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, python-dateutil }: buildPythonPackage rec { pname = "koji"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0a3kn3qvspvx15imgzzzjsbvw6bqmbk29apbliqwifa9cj7pvb40"; }; - propagatedBuildInputs = [ pycurl six rpm dateutil ]; + propagatedBuildInputs = [ pycurl six rpm python-dateutil ]; # Judging from SyntaxError disabled = isPy3k; diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/development/python-modules/mailman-rss/default.nix index e2043b0d6d4d..f71b62c67fc4 100644 --- a/pkgs/development/python-modules/mailman-rss/default.nix +++ b/pkgs/development/python-modules/mailman-rss/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1brrik70jyagxa9l0cfmlxvqpilwj1q655bphxnvjxyganxf4c00"; }; - propagatedBuildInputs = with python3Packages; [ dateutil future requests beautifulsoup4 ] + propagatedBuildInputs = with python3Packages; [ python-dateutil future requests beautifulsoup4 ] ++ lib.optional withTwitter python3Packages.twitter ; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index a6ee1a3bade7..96d33b681ebc 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, pycairo, backports_functools_lru_cache -, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver +, which, cycler, python-dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 , fetchpatch , enableGhostscript ? false, ghostscript, gtk3 @@ -38,7 +38,7 @@ buildPythonPackage rec { ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver + [ cycler python-dateutil nose numpy pyparsing tornado freetype kiwisolver libpng mock pytz ] ++ lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 75f75e981ce0..beddaf6810dd 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo -, which, cycler, dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver +, which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection , certifi, pillow , enableGhostscript ? true, ghostscript, gtk3 @@ -36,7 +36,7 @@ buildPythonPackage rec { ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil numpy pyparsing tornado freetype qhull + [ cycler python-dateutil numpy pyparsing tornado freetype qhull kiwisolver certifi libpng mock pytz pillow ] ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 3d72748a1e74..078c455a6373 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -4,7 +4,7 @@ , isPy27 # python dependencies , click -, dateutil +, python-dateutil , etelemetry , filelock , funcsigs @@ -68,7 +68,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click - dateutil + python-dateutil etelemetry filelock funcsigs diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 41c6ffb72284..793e23d71135 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -5,7 +5,7 @@ , configparser , cryptography , pyopenssl -, dateutil +, python-dateutil , pytz }: @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - certifi configparser cryptography pyopenssl dateutil pytz + certifi configparser cryptography pyopenssl python-dateutil pytz ]; # Tests fail: https://github.com/oracle/oci-python-sdk/issues/164 diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 3ccd3d916b65..ea80fade1411 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } : +{ lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; version = "0.24.1"; @@ -9,7 +9,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ dateutil pyproj pytz requests pyyaml ]; + propagatedBuildInputs = [ python-dateutil pyproj pytz requests pyyaml ]; # 'tests' dir not included in pypy distribution archive. doCheck = false; diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix index 8af4094b0cfb..9b29a8442696 100644 --- a/pkgs/development/python-modules/pandas/2.nix +++ b/pkgs/development/python-modules/pandas/2.nix @@ -8,7 +8,7 @@ , pytest , glibcLocales , cython -, dateutil +, python-dateutil , scipy , moto , numexpr @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; buildInputs = lib.optional stdenv.isDarwin libcxx; propagatedBuildInputs = [ - dateutil + python-dateutil scipy numexpr pytz @@ -68,7 +68,7 @@ buildPythonPackage rec { disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ - # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat + # since python-dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case "test_fallback_plural" "test_ambiguous_flags" diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 2d5020168215..b7e237a3e3ba 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -7,7 +7,7 @@ , beautifulsoup4 , bottleneck , cython -, dateutil +, python-dateutil , html5lib , jinja2 , lxml @@ -47,7 +47,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ beautifulsoup4 bottleneck - dateutil + python-dateutil html5lib numexpr lxml diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 1ae27b5ecf87..5419407d610e 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , glibcLocales, git , mock, nose, markdown, lxml, typogrify -, jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator +, jinja2, pygments, docutils, pytz, unidecode, six, python-dateutil, feedgenerator , blinker, pillow, beautifulsoup4, markupsafe, pandoc }: buildPythonPackage rec { @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jinja2 pygments docutils pytz unidecode six dateutil feedgenerator + jinja2 pygments docutils pytz unidecode six python-dateutil feedgenerator blinker pillow beautifulsoup4 markupsafe lxml ]; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 5688090b0958..d432ca271dd7 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, pythonOlder -, dateutil +, python-dateutil , importlib-metadata , poetry , poetry-core @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ dateutil pytzdata ] + propagatedBuildInputs = [ python-dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index acee0f09b848..9844b018518b 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -3,7 +3,7 @@ , fetchPypi , lxml , networkx -, dateutil +, python-dateutil , rdflib , pydot }: @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml networkx - dateutil + python-dateutil rdflib ]; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index e6ee7d4f9832..e3422aff024e 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -14,7 +14,7 @@ , psutil , pyelftools , pyserial -, dateutil +, python-dateutil , requests , rpyc , tox @@ -63,7 +63,7 @@ buildPythonPackage rec { psutil pyelftools pyserial - dateutil + python-dateutil requests rpyc tox diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index e8e0809c0222..49dfbf030966 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, numpy, dateutil }: +{ lib, fetchPypi, buildPythonPackage, numpy, python-dateutil }: buildPythonPackage rec { pname = "pycollada"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1rp4wlvfywgk3v6l3hnhjx61x9yqawvvivpq4dig2jj71k3mpsyj"; }; - propagatedBuildInputs = [ numpy dateutil ]; + propagatedBuildInputs = [ numpy python-dateutil ]; # Some tests fail because they refer to test data files that don't exist # (upstream packaging issue) diff --git a/pkgs/development/python-modules/pyflick/default.nix b/pkgs/development/python-modules/pyflick/default.nix index b1f39353c142..b6a9c2cf96d4 100644 --- a/pkgs/development/python-modules/pyflick/default.nix +++ b/pkgs/development/python-modules/pyflick/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , aiohttp -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - dateutil + python-dateutil ]; # no tests implemented diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index e54a9c6fa20f..5d23949eba62 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonPackage , lxml, pycryptodomex, construct -, argon2_cffi, dateutil, future +, argon2_cffi, python-dateutil, future , python }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml pycryptodomex construct - argon2_cffi dateutil future + argon2_cffi python-dateutil future ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pykwalify/default.nix b/pkgs/development/python-modules/pykwalify/default.nix index b65c0fd46709..cf42c98457cb 100644 --- a/pkgs/development/python-modules/pykwalify/default.nix +++ b/pkgs/development/python-modules/pykwalify/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , docopt , fetchPypi , pytestCheckHook @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil docopt pyyaml ruamel-yaml diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 9506b8bae953..0eb13c732d7e 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, dateutil +, python-dateutil , pkgs }: @@ -17,7 +17,7 @@ buildPythonPackage rec { }; buildInputs = [ pkgs.coreutils ]; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; preInstall = lib.optionalString stdenv.isDarwin '' sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 30fcfc52cba8..5de5ad3a0dbe 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , substituteAll , xmlsec -, cryptography, defusedxml, pyopenssl, dateutil, pytz, requests, six +, cryptography, defusedxml, pyopenssl, python-dateutil, pytz, requests, six , mock, pyasn1, pymongo, pytest, responses, xmlschema, importlib-resources }: @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography - dateutil + python-dateutil defusedxml importlib-resources pyopenssl diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 19edd7057eb4..d2fc8470d487 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -4,7 +4,7 @@ , pythonOlder , pybind11 , pytestCheckHook -, dateutil +, python-dateutil , doxygen , python , pelican @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - dateutil + python-dateutil doxygen python pelican diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix index e484c07f31ca..02c948fd405a 100644 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ b/pkgs/development/python-modules/rainbowstream/default.nix @@ -8,7 +8,7 @@ , pyfiglet , requests , arrow -, dateutil +, python-dateutil , pysocks , pocket }: @@ -42,7 +42,7 @@ buildPythonPackage rec { done ''; - buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow dateutil pysocks pocket ]; + buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow python-dateutil pysocks pocket ]; meta = with lib; { description = "Streaming command-line twitter client"; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index 838ffd471840..34b95fe781d9 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -5,7 +5,7 @@ , pkgs , cython , dnspython -, dateutil +, python-dateutil , xcaplib , msrplib , lxml @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ alsa-lib ffmpeg_3 libv4l sqlite libvpx ]; - propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; + propagatedBuildInputs = [ cython pkgs.openssl dnspython python-dateutil xcaplib msrplib lxml python-otr ]; meta = with lib; { description = "SIP SIMPLE implementation for Python"; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index b59209f42956..dc983e20ce23 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi, buildPythonPackage , six, sqlalchemy -, mock, pytz, isort, flake8, jinja2, pg8000, pyodbc, pytest, pymysql, dateutil +, mock, pytz, isort, flake8, jinja2, pg8000, pyodbc, pytest, pymysql, python-dateutil , docutils, flexmock, psycopg2, pygments }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { pyodbc pytest pymysql - dateutil + python-dateutil docutils flexmock psycopg2 diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix index 1c36f45090b8..bcf35d1f5f70 100644 --- a/pkgs/development/python-modules/suseapi/default.nix +++ b/pkgs/development/python-modules/suseapi/default.nix @@ -7,7 +7,7 @@ , mechanize , beautifulsoup4 , pyxdg -, dateutil +, python-dateutil , requests , httpretty }: @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests + django suds-jurko ldap mechanize beautifulsoup4 pyxdg python-dateutil requests ]; buildInputs = [ httpretty ]; diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 523d3e303b32..80d86c3edb01 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -4,7 +4,7 @@ , nose , tox , six -, dateutil +, python-dateutil , kitchen , pytz , pkgs @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ nose pkgs.taskwarrior tox ]; - propagatedBuildInputs = [ six dateutil kitchen pytz ]; + propagatedBuildInputs = [ six python-dateutil kitchen pytz ]; meta = with lib; { homepage = "https://github.com/ralphbean/taskw"; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index f0cb79b0a8bb..d5ddf8f58802 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -6,7 +6,7 @@ , lxml , relatorio , genshi -, dateutil +, python-dateutil , polib , python-sql , werkzeug @@ -41,7 +41,7 @@ buildPythonApplication rec { lxml relatorio genshi - dateutil + python-dateutil polib python-sql werkzeug diff --git a/pkgs/development/python-modules/urllib3/2.nix b/pkgs/development/python-modules/urllib3/2.nix index 3fc90fe5d821..f1eea4c31d8d 100644 --- a/pkgs/development/python-modules/urllib3/2.nix +++ b/pkgs/development/python-modules/urllib3/2.nix @@ -3,7 +3,7 @@ , buildPythonPackage , certifi , cryptography -, dateutil +, python-dateutil , fetchpatch , fetchPypi , idna @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; checkInputs = [ - dateutil + python-dateutil mock pytest-freezegun pytest-timeout diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index eec8e284c0eb..6d73357e3bc2 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -2,7 +2,7 @@ , brotli , buildPythonPackage , cryptography -, dateutil +, python-dateutil , fetchPypi , idna , isPy27 @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; checkInputs = [ - dateutil + python-dateutil mock pytest-freezegun pytest-timeout diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 823d2820e1bd..dc1223419249 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, future, dateutil, six, pytest, mock, parameterized }: +{ lib, buildPythonPackage, fetchPypi, future, python-dateutil, six, pytest, mock, parameterized }: buildPythonPackage rec { pname = "vertica-python"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "94cff37e03f89fc4c5e4b2d4c913c7d5d7450f5a205d14f709b39e0a4202be95"; }; - propagatedBuildInputs = [ future dateutil six ]; + propagatedBuildInputs = [ future python-dateutil six ]; checkInputs = [ pytest mock parameterized ]; diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 1bb87d9d1222..30f84150283c 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }: +{ lib, buildPythonPackage, fetchPypi, isPyPy, python, python-dateutil }: buildPythonPackage rec { version = "0.9.6.1"; @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = isPyPy; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; checkPhase = "${python.interpreter} tests.py"; diff --git a/pkgs/development/python-modules/webdavclient3/default.nix b/pkgs/development/python-modules/webdavclient3/default.nix index eb13cd6b9bbf..fc63c1913d00 100644 --- a/pkgs/development/python-modules/webdavclient3/default.nix +++ b/pkgs/development/python-modules/webdavclient3/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy27, lib, dateutil, lxml, requests +{ buildPythonPackage, fetchPypi, isPy27, lib, python-dateutil, lxml, requests , pytestCheckHook }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0yw3n5m70ysjn1ch48znpn4zr4a1bd0lsm7q2grqz7q5hfjzjwk0"; }; - propagatedBuildInputs = [ dateutil lxml requests ]; + propagatedBuildInputs = [ python-dateutil lxml requests ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 3ce15a3fdcea..b1afa242107e 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , Babel , cssselect -, dateutil +, python-dateutil , feedparser , futures ? null , gdata @@ -52,7 +52,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ Babel cssselect - dateutil + python-dateutil feedparser gdata gnupg diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 4794843a66d8..fc5e6e9dc65b 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -5,7 +5,7 @@ , Babel , colorama , cssselect -, dateutil +, python-dateutil , feedparser , gdata , gnupg @@ -49,7 +49,7 @@ buildPythonPackage rec { Babel colorama cssselect - dateutil + python-dateutil feedparser gdata gnupg diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9c3e99e23ad6..8c150e114f9b 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -56,7 +56,7 @@ in newPython.pkgs.buildPythonApplication rec { propagatedBuildInputs = with newPython.pkgs; [ bottle colorama - dateutil + python-dateutil deprecation distro fasteners diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 385db11d7ff4..67137fb1ed93 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - pyyaml cbor2 dateutil tomlkit u-msgpack-python + pyyaml cbor2 python-dateutil tomlkit u-msgpack-python ]; meta = with lib; { diff --git a/pkgs/misc/pylode/default.nix b/pkgs/misc/pylode/default.nix index fb908151765c..33e78bc15231 100644 --- a/pkgs/misc/pylode/default.nix +++ b/pkgs/misc/pylode/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - dateutil + python-dateutil falcon gunicorn isodate diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 2e825dc96152..34bb901f6713 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { six pyasn1 pyasn1-modules - dateutil + python-dateutil argcomplete libselinux ])) diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 99eae786cbf6..33d31fb8e722 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 -, django-haystack, flufl_lock, networkx, dateutil, defusedxml +, django-haystack, flufl_lock, networkx, python-dateutil, defusedxml , django-paintstore, djangorestframework, django, django-q , django_compressor, beautifulsoup4, six, psycopg2, whoosh, elasticsearch }: @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ isort ]; propagatedBuildInputs = [ robot-detection django_extensions rjsmin cssmin django-mailman3 - django-haystack flufl_lock networkx dateutil defusedxml + django-haystack flufl_lock networkx python-dateutil defusedxml django-paintstore djangorestframework django django-q django_compressor six psycopg2 isort ]; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 3ba6f3270425..afcded311160 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -33,7 +33,7 @@ toPythonModule (buildPythonApplication rec { propagatedBuildInputs = [ Babel certifi - dateutil + python-dateutil flask flaskbabel gevent diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index d9fd55f32c92..5b61e4828ef6 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - boto3 termcolor dateutil docutils setuptools jmespath + boto3 termcolor python-dateutil docutils setuptools jmespath ]; checkInputs = [ python3Packages.pytestCheckHook ]; diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index 8996ef5069f3..729f0aa8fd91 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - oci arrow certifi pinned_click configparser cryptography jmespath dateutil + oci arrow certifi pinned_click configparser cryptography jmespath python-dateutil pytz retrying six terminaltables pyopenssl pyyaml ]; diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix index b02ce82291aa..a5ad2c3625c1 100644 --- a/pkgs/tools/backup/tarsnapper/default.nix +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { py.test . ''; - propagatedBuildInputs = with python3Packages; [ pyyaml dateutil pexpect ]; + propagatedBuildInputs = with python3Packages; [ pyyaml python-dateutil pexpect ]; patches = [ ./remove-argparse.patch ]; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 72de0295c714..0ccc96ce1885 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -132,7 +132,7 @@ let ps.cherrypy ps.cmd2 ps.colorama - ps.dateutil + ps.python-dateutil ps.jsonpatch ps.pecan ps.prettytable diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index da79110f9a82..ef84981a9d95 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, fetchurl, lib -, dateutil, argcomplete, argh, psycopg2, boto3 +, python-dateutil, argcomplete, argh, psycopg2, boto3 }: buildPythonApplication rec { @@ -12,7 +12,7 @@ buildPythonApplication rec { sha256 = "Ts8I6tlP2GRp90OIIKXy+cRWWvUO3Sm86zq2dtVP5YE="; }; - propagatedBuildInputs = [ dateutil argh psycopg2 boto3 argcomplete ]; + propagatedBuildInputs = [ python-dateutil argh psycopg2 boto3 argcomplete ]; # Tests are not present in tarball checkPhase = '' diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix index 916f15c94c6e..8403a6c25752 100644 --- a/pkgs/tools/misc/pdd/default.nix +++ b/pkgs/tools/misc/pdd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication, dateutil }: +{ lib, fetchFromGitHub, buildPythonApplication, python-dateutil }: buildPythonApplication rec { pname = "pdd"; @@ -13,7 +13,7 @@ buildPythonApplication rec { format = "other"; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 3b6df828fda0..36afc1d4cbb0 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six + argcomplete python-dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4 ]; diff --git a/pkgs/tools/networking/cloud-custodian/default.nix b/pkgs/tools/networking/cloud-custodian/default.nix index a57d9f13d785..c5e1f7527dac 100644 --- a/pkgs/tools/networking/cloud-custodian/default.nix +++ b/pkgs/tools/networking/cloud-custodian/default.nix @@ -3,7 +3,7 @@ , boto3 , botocore , certifi -, dateutil +, python-dateutil , jsonpatch , jsonschema , pyyaml @@ -26,7 +26,7 @@ buildPythonApplication rec { boto3 botocore certifi - dateutil + python-dateutil jsonpatch jsonschema pyyaml diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 15f6ff3dfa0c..888d6a05c67d 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: +{ lib, buildPythonApplication, fetchFromGitHub, python_magic, python-dateutil }: buildPythonApplication rec { pname = "s3cmd"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "0p6mbgai7f0c12pkw4s7d649gj1f8hywj60pscxvj9jsna3iifhs"; }; - propagatedBuildInputs = [ python_magic dateutil ]; + propagatedBuildInputs = [ python_magic python-dateutil ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/tools/package-management/nixops/azure-storage/default.nix b/pkgs/tools/package-management/nixops/azure-storage/default.nix index 6693a7464d43..c6f3d71e98ea 100644 --- a/pkgs/tools/package-management/nixops/azure-storage/default.nix +++ b/pkgs/tools/package-management/nixops/azure-storage/default.nix @@ -4,7 +4,7 @@ , python , azure-common , futures -, dateutil +, python-dateutil , requests , isPy3k }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; }; - propagatedBuildInputs = [ azure-common dateutil requests ] + propagatedBuildInputs = [ azure-common python-dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18f860ffc514..0bc050e4eb53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22801,7 +22801,7 @@ in acd-cli = callPackage ../applications/networking/sync/acd_cli { inherit (python3Packages) - buildPythonApplication appdirs colorama dateutil + buildPythonApplication appdirs colorama python-dateutil requests requests_toolbelt setuptools sqlalchemy fusepy; }; From 88cb011dfe8c1cdaeffcf68ca97315507b426cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Jul 2021 13:24:04 +0200 Subject: [PATCH 22/75] pythonPackages.dateutil: move to python-aliases.nix --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7ea357116233..75b407c0e57d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -35,6 +35,7 @@ in mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dns = dnspython; # Alias for compatibility, 2017-12-10 faulthandler = throw "faulthandler is built into ${python.executable}"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b4cfe246795..0d7f97269c26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6917,8 +6917,6 @@ in { python-daemon = callPackage ../development/python-modules/python-daemon { }; python-dateutil = callPackage ../development/python-modules/dateutil { }; - # Alias that we should deprecate - dateutil = self.python-dateutil; python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; From 49ac4dfab9c804f6712f71eaffa621a621bf598d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 20:36:00 +0200 Subject: [PATCH 23/75] python3Packages.bravado-core: 5.16.1 -> 5.17.0 --- pkgs/development/python-modules/bravado-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index 8c65cca07b2e..24db42b7a74f 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "bravado-core"; - version = "5.16.1"; + version = "5.17.0"; src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "0r9gk5vkjbc407fjydms3ik3hnzajq54znyz58d8rm6pvqcvjjpl"; + sha256 = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE="; }; checkInputs = [ From 9b16b5e381aeff13484507ed3ce4db608efb8398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 3 Jul 2021 16:24:43 +0200 Subject: [PATCH 24/75] conan: fix build after python3Packages updates conan needs jinja2<3 and six<=1.15.0. Adding six to packageOverrides results in this build error: $ nix-build -A conan ... Found duplicated packages in closure for dependency 'six': six 1.16.0 (/nix/store/zn4haxpv5j9ilccvw7vxxwbfb84vhl5i-python3.8-six-1.16.0/lib/python3.8/site-packages) six 1.15.0 (/nix/store/8nkfc88xal8g91hfjsxq93b6pfydq2d7-python3.8-six-1.15.0/lib/python3.8/site-packages) As the changes in six-1.16.0 look harmless, work around the above issue by allowing conan to use six-1.16.0. --- .../tools/build-managers/conan/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9c3e99e23ad6..a7b9d1b76a76 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -39,6 +39,22 @@ let newPython = python3.override { "test_ec_verify_should_return_false_if_signature_invalid" ]; }); + # conan needs jinja2<3 + jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { + version = "2.11.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; + }; + }); + # old jinja2 needs old markupsafe + markupsafe = super.markupsafe.overridePythonAttrs (oldAttrs: rec { + version = "1.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; + }; + }); }; }; @@ -92,7 +108,8 @@ in newPython.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace conans/requirements.txt \ - --replace "deprecation>=2.0, <2.1" "deprecation" + --replace "deprecation>=2.0, <2.1" "deprecation" \ + --replace "six>=1.10.0,<=1.15.0" "six>=1.10.0,<=1.16.0" ''; meta = with lib; { From b84b5172a945a5a4028f8c91182917417db4678e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 01:58:20 +0000 Subject: [PATCH 25/75] blas-reference: 3.8.0 -> 3.10.0 fixup references to ARCH and ARCHFLAGS which have been renamed AR and ARFLAGS respectively --- .../libraries/science/math/blas/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 332806c495c9..85a73ccd5697 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "blas"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; - sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm"; + sha256 = "sha256-LjYNmcm9yEB6YYiMQKqFP7QhlCDruCZNtIbLiGBGirM="; }; buildInputs = [ gfortran ]; @@ -20,17 +20,17 @@ stdenv.mkDerivation rec { echo >>make.inc "NOOPT = -O0 -fPIC" echo >>make.inc "LOADER = gfortran" echo >>make.inc "LOADOPTS =" - echo >>make.inc "ARCH = gfortran" - echo >>make.inc "ARCHFLAGS = -shared -o" + echo >>make.inc "AR = gfortran" + echo >>make.inc "ARFLAGS = -shared -o" echo >>make.inc "RANLIB = echo" echo >>make.inc "BLASLIB = libblas.so.${version}" ''; buildPhase = '' make - echo >>make.inc "ARCHFLAGS = " + echo >>make.inc "ARFLAGS = " echo >>make.inc "BLASLIB = libblas.a" - echo >>make.inc "ARCH = ar rcs" + echo >>make.inc "AR = ar rcs" echo >>make.inc "RANLIB = ranlib" make ''; From aed1ed7d04d348921dc2634f36b04dd6856c09a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 23:57:21 +0200 Subject: [PATCH 26/75] amass: 3.11.2 -> 3.13.2 --- pkgs/tools/networking/amass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 67dce4c2e8b7..bf8a1b8e4f83 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "amass"; - version = "3.11.2"; + version = "3.13.2"; src = fetchFromGitHub { owner = "OWASP"; @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-3J4yT7GTuVzkxMb+fCD3S9u0XBHa4Y0W+BnkDJ4PhWI="; }; - vendorSha256 = "sha256-8GzzihKhrf71lLKgb2i3NnmSctvKb95V5pOGoWAgclk="; + vendorSha256 = "0nbj41ha31lkwraxwvyavdr94y9nnxl6z85jjkszxbd12a5g6v7h"; outputs = [ "out" "wordlists" ]; From 89d78be7f8d8a6b94dc38a73d695dd7f1f2bf596 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jul 2021 00:11:01 +0200 Subject: [PATCH 27/75] lynis: 3.0.4 -> 3.0.5 --- pkgs/tools/security/lynis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index b2ef8d8354b4..094aab1e86d3 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "CISOfy"; repo = pname; rev = version; - sha256 = "sha256-/pF1V8ZsylQOCW7K/O0R3HYYDdsdNDVmmUar21EzpcQ="; + sha256 = "sha256-IJCLj3iSPkfkYOqTu7adtU26jTgKfRmiwIfKvSApdIY="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From a50a9bbef78a73f5a29e6d6ebeccde4245174205 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jul 2021 00:19:44 +0200 Subject: [PATCH 28/75] tfsec: 0.39.16 -> 0.40.7 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 246f42b63999..4e11d92e9682 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.39.16"; + version = "0.40.7"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5We3Nk/AU5dj37vG4pvqzvNztK01PAPadQV/CgHZe8w="; + sha256 = "1cdxpmlfh76k491ldzv2flxs2wikrryr63h0zw8f6yvhkpbqf4cc"; }; goPackagePath = "github.com/tfsec/tfsec"; From e6c88a031c43574cb4609fe30310c820ec871930 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jul 2021 00:21:44 +0200 Subject: [PATCH 29/75] sn0int: 0.21.1 -> 0.21.2 --- pkgs/tools/security/sn0int/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 5d1244e86196..43a390104413 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LjNOaqYGlhF0U+YxoLLmmXgxPa8f+t9BSm+qO23waaI="; + sha256 = "sha256-BKdi/o/A0fJBlcKTDTCX7uGkK6QR0S9hIn0DI3CN5Gg="; }; - cargoSha256 = "sha256-ruK+qDIqrltNcErBnrcHdPfVKmwPwiPfq42A/el206c="; + cargoSha256 = "sha256-MeMTXwb5v4iUJQSViOraXAck7n6VlIW2Qa0qNUZWu1g="; nativeBuildInputs = [ pkg-config From e4951b579de021272a33abcbe7bdab69d5cb780b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jul 2021 00:26:12 +0200 Subject: [PATCH 30/75] sslscan: 2.0.9 -> 2.0.10 --- pkgs/tools/security/sslscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 29762fc527c3..4bd7a3ff2214 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.0.9"; + version = "2.0.10"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = version; - sha256 = "0594svwz4pya0syibar0ahmi5zdjbwd5kg6hrlhfpmmslrsyli6m"; + sha256 = "sha256-L6cNmvR6zy2tkMHh+LBsQ3VZDUr0tD5AlOEj+dTLV5k="; }; buildInputs = [ openssl ]; From 7b58fcf2a591c0b45b524bcab78ae46f9c53444b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jul 2021 00:28:31 +0200 Subject: [PATCH 31/75] teleport: 6.2.5 -> 6.2.7 --- pkgs/servers/teleport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index d898cc9bcca7..ad96798133b5 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -11,14 +11,14 @@ in buildGoModule rec { pname = "teleport"; - version = "6.2.5"; + version = "6.2.7"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-OBo1TWN7KxI7DAUcRLwXXQjErhhgpLBrJBR55ewKiYw="; + sha256 = "0ychs2pqi3awbr0vraz0ksddwk5hihrd1d9raq8mxyw5dz5124ki"; }; vendorSha256 = null; From 74199e111e53c7b5705df277516951103b65724c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jul 2021 00:31:28 +0200 Subject: [PATCH 32/75] stunnel: 5.58 -> 5.59 --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index f8b6c845a52e..befc1c3c3eef 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.58"; + version = "5.59"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79"; + sha256 = "sha256-E3d232vo8XAfHNWQt3eZMuEjR5+5HlGSFxwWeYgVzp8="; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; From 0216963c9fad4c1307397b6cb8ba706ba4f3f542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 4 Jul 2021 01:59:24 +0200 Subject: [PATCH 33/75] python3Packages.aiomusiccast: 0.8.1 -> 0.8.2 https://github.com/vigonotion/aiomusiccast/releases/tag/0.8.2 --- pkgs/development/python-modules/aiomusiccast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index e77642f510a7..267ca5b4a5a6 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.8.1"; + version = "0.8.2"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "sha256-1k0ELXA8TgAyRYdzSFXp/BsPesC1WCiC4PqHfcPk0u8="; + sha256 = "sha256-XmDE704c9KJst8hrvdyQdS52Sd6RnprQZjBCIWAaiho="; }; nativeBuildInputs = [ From d09892f52149fdd22720facc4e4b196d043c720c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 4 Jul 2021 02:40:07 +0200 Subject: [PATCH 34/75] onefetch: 2.9.1 -> 2.10.2 --- pkgs/tools/misc/onefetch/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index a80fdd568643..6e7484a7e40d 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -1,18 +1,26 @@ -{ fetchFromGitHub, rustPlatform, lib, stdenv, fetchpatch -, CoreFoundation, libiconv, libresolv, Security }: +{ fetchFromGitHub +, rustPlatform +, lib +, stdenv +, fetchpatch +, CoreFoundation +, libiconv +, libresolv +, Security +}: rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.9.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-owa+HmzMXpLR7H1FssW4gQiVAQGJRXhcitgJj6pxJRc="; + sha256 = "sha256-lrRp01ZeK9bGn7L7SqAxJAU9qugpHnC06CWChhVPGGQ="; }; - cargoSha256 = "sha256-Bn2FlRESuW83ouGPiBwvGkIB0uCDDG0hdhRfRBks/0Q="; + cargoSha256 = "sha256-vNa1OF1x/MCTo9B4DTDZNWyHTsOl7Za3EgjnpsL/gWg="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; @@ -20,6 +28,6 @@ rustPlatform.buildRustPackage rec { description = "Git repository summary on your terminal"; homepage = "https://github.com/o2sh/onefetch"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne kloenk ]; + maintainers = with maintainers; [ Br1ght0ne kloenk SuperSandro2000 ]; }; } From d4cd4061d4600d36e5b9c1727c5ba860018420c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 4 Jul 2021 02:47:51 +0200 Subject: [PATCH 35/75] pythonPackages.pillow-simd: revert update to 8.1.2 --- pkgs/development/python-modules/pillow-simd/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index d7b2ff8d6b36..e2ea4c713888 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -6,15 +6,16 @@ import ../pillow/generic.nix (rec { pname = "Pillow-SIMD"; - version = "8.1.2"; - + # check for release version on https://pypi.org/project/Pillow-SIMD/#history + # does not match the latest pillow release version! + version = "7.0.0.post3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "uploadcare"; repo = "pillow-simd"; - rev = version; - sha256 = "1z0c1qpx7l1bhj71ww7za7kl29j5wdraqr2pdhv4dp1q74kgrr0m"; + rev = "v${version}"; + sha256 = "1h832xp1bzf951hr4dmjmxqfsv28sx9lr2cq96qdz1c72k40zj1h"; }; meta = with lib; { From 004febc0cbfce686d53993713fca36b0119ba5fc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 3 Jul 2021 20:27:42 -0500 Subject: [PATCH 36/75] subsurface: 5.0.1 -> 5.0.2 --- pkgs/applications/misc/subsurface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 7420267aa7d2..d5a7d6f0fd67 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -5,13 +5,13 @@ }: let - version = "5.0.1"; + version = "5.0.2"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "01r836ckvrmgprjf4cqxn2n3w5w4pa2fjrhspjndsspic8nwlrwg"; + sha256 = "1yay06m8p9qp2ghrg8dxavdq55y09apcgdnb7rihgs3hq86k539n"; fetchSubmodules = true; }); From 2de0ccd9dd7ebff2d59f178905775f0e5e502594 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 01:58:43 +0000 Subject: [PATCH 37/75] bitwarden: 1.26.4 -> 1.27.0 --- pkgs/tools/security/bitwarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index daddf9a71b6a..39756c9e9a78 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.26.4"; + x86_64-linux = "1.27.0"; }.${system} or ""; sha256 = { - x86_64-linux = "sha256-PYqLf1Y3SwPFjq8JJMxHrKWKuCqbVpmzugi3DjRNWUg="; + x86_64-linux = "sha256-Ik+g7jkTBHRbGwDhbiJGQorMmt6GhCXVUd82Sug9a28="; }.${system} or ""; meta = with lib; { From a0d5f7eacaa871eefea54a9e8710d129cf865ae5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 02:29:32 +0000 Subject: [PATCH 38/75] cargo-release: 0.15.1 -> 0.16.0 --- pkgs/tools/package-management/cargo-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index a8fc47957066..aeb18f2efdef 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-bCxfZFFmk1Y1Rs41yZXogIjsnZhS/TzkZNXOixbvONU="; + sha256 = "sha256-+vQXaI6v8HXzsfXZFxmBJe+1u9nmW0z3SBjo38orJYA="; }; - cargoSha256 = "sha256-3wSy5WGBLC44Iy3yw2M1f1KpB8KHei+hHuqCGXutgi0="; + cargoSha256 = "sha256-Zcg1MAAESD6qrh7domslisT2wG4ZaYyZtPCQ5IQrLVo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From 6a8335bea0a5307a87f37da21f582536709f4be6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 02:35:53 +0000 Subject: [PATCH 39/75] chezmoi: 2.0.16 -> 2.1.0 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 81e2061b4cc1..5d9790ec2be0 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.0.16"; + version = "2.1.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-0m5ya3S/aqQr0n6MdfWfTo0Q7xTS5qY+iDhexwDGdWo="; + sha256 = "sha256-TEY3oEAWnS+iuLgAgR9mp1TaEb+wzlAgN41dgLRdUs4="; }; - vendorSha256 = "sha256-k2dw8WfOxK+VpnJonm/GXm49rUdIXSA81RO0g+8ocBs="; + vendorSha256 = "sha256-pr6bMO1klq/V9zkBftLleSRTg3zjl24EuA283M88HY4="; doCheck = false; From 5573210d8792c0779b2013873335a144bd98b7ee Mon Sep 17 00:00:00 2001 From: Jade Date: Sat, 3 Jul 2021 19:42:47 -0700 Subject: [PATCH 40/75] nix-doc: 0.3.3 -> 0.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This release adds a ctags implementation to generate tags for Nix script! 🎉 --- pkgs/tools/package-management/nix-doc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index ae01601dde4f..af83d04e8110 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.3.3"; + version = "0.5.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "0vd7159y5w8jjgaw51kfr3z3r50299gvw7vjchpqx3nwmdink8bh"; + sha256 = "1s0nlbn5fcgqfns8gpx3i87k5qivd8ar59rklvd7fbn6ckrmzi6m"; }; doCheck = true; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "0xsy13yxm8vblab73gynb781ya168w66c32i1lyv0ns1lnz61dmh"; + cargoSha256 = "0xmw3fyic0fcg7a6z8dr3lv367bxqdhdrlrl2hhlz59xg5kq8b3f"; meta = with lib; { description = "An interactive Nix documentation tool"; - longDescription = "An interactive Nix documentation tool providing a CLI for function search and a Nix plugin for docs in the REPL"; + longDescription = "An interactive Nix documentation tool providing a CLI for function search, a Nix plugin for docs in the REPL, and a ctags implementation for Nix script"; homepage = "https://github.com/lf-/nix-doc"; license = licenses.lgpl3; maintainers = [ maintainers.lf- ]; From d9a91ae52a4862fdf242a5e058c9311c4089127c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 02:45:14 +0000 Subject: [PATCH 41/75] cloud-nuke: 0.2.0 -> 0.3.0 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index ecb6991d3d90..75fb29db8827 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FQx5k6HuOf3gKa71LteNGhH2KILUQ+aeKmtQXRwTNYI="; + sha256 = "sha256-rxWTh+iltD1kcntlu9sovwG/mQPmukYbw8V2FAFi1KE="; }; - vendorSha256 = "sha256-VsP1YWvszux7qiRVLRF40NX3qoNOa9yrfRhQAaw7aKI="; + vendorSha256 = "sha256-mfNbcnJ62v6tdEhOtA0P9lDoD5HmLBAtNcrv1H3/mSE="; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; From 528b0ccfd1153bb86a78848366a24b55dfdfbb46 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 05:33:23 +0000 Subject: [PATCH 42/75] gobgp: 2.28.0 -> 2.29.0 --- pkgs/tools/networking/gobgp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 96f806aad39f..98925489e548 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-AlAfs1wi3hS7cqAtGqfUgv5CIonu7TmXWgxL1zSBh54="; + sha256 = "sha256-DhSIf8fAG2Zf0mwJ/iMgQU5sugHK2jJ6WJPbFbA/mhM="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; From f50ffddc9152e8c429ea32b785da821f3bf1139c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 05:37:39 +0000 Subject: [PATCH 43/75] gobgpd: 2.28.0 -> 2.29.0 --- pkgs/servers/misc/gobgpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 450e454374f0..570b2b40c159 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-AlAfs1wi3hS7cqAtGqfUgv5CIonu7TmXWgxL1zSBh54="; + sha256 = "sha256-DhSIf8fAG2Zf0mwJ/iMgQU5sugHK2jJ6WJPbFbA/mhM="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; From af7a317f79d07270a5ac036e3d22083f7ff6b2be Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 4 Jul 2021 06:48:35 +1000 Subject: [PATCH 44/75] kepubify: 3.1.6 -> 4.0.0 https://github.com/pgaskin/kepubify/releases/tag/v4.0.0 --- pkgs/tools/misc/kepubify/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 546dcb112a86..b1ece43154fe 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -2,18 +2,21 @@ buildGoModule rec { pname = "kepubify"; - version = "3.1.6"; + version = "4.0.0"; src = fetchFromGitHub { owner = "pgaskin"; repo = pname; rev = "v${version}"; - sha256 = "129izxgvhcybipfgcwzzwsir9zhi7axxadnw822zy5rk2ky4zjpk"; + sha256 = "sha256-Mxe43U0kxkSdAzs+lSJ0x/VspbJPam59DpTpFEJVMl4="; }; - vendorSha256 = "0vwzm1c4kada7mqdkr444gj8c2vkvz7av9wkpgdpjrq0v2h0hpcc"; + vendorSha256 = "sha256-bLQH7ZY2hE8fBTcW7DNoUQxe4N3m9Mv3JjjKO4cG7DY="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + # remove when built with >= go 1.17 + buildFlags = [ "-tags" "zip117" ]; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; excludedPackages = [ "kobotest" ]; From c0dd9c3b3dffb6be8a60f0c92109a5e037f63012 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 3 Jul 2021 23:59:40 -0700 Subject: [PATCH 45/75] firefox: increase timeout to 86400s (24h) Fixes: #129115 --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 725205c5c209..d16c625e2dba 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -203,6 +203,7 @@ stdenv.mkDerivation { url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; platforms = builtins.attrNames mozillaPlatforms; + timeout = 86400; # 24 hours (increased from the Hydra default of 10h, c.f. #129115) maintainers = with maintainers; [ taku0 lovesegfault ]; }; } From 055dc300ff0de7f901b972cef9483a36c0cbf83e Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Sun, 4 Jul 2021 14:24:11 +0800 Subject: [PATCH 46/75] sd: install man page and shell completions --- pkgs/tools/text/sd/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 1536e72ad29e..009150062db2 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { @@ -14,8 +14,17 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1iwgy9zzdxay6hb9pz47jchy03jrsy5csxijlq4i228qhqnvq1lr"; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + preFixup = '' + installManPage $releaseDir/build/sd-*/out/sd.1 + + installShellCompletion $releaseDir/build/sd-*/out/sd.{bash,fish} + installShellCompletion --zsh $releaseDir/build/sd-*/out/_sd + ''; + meta = with lib; { description = "Intuitive find & replace CLI (sed alternative)"; homepage = "https://github.com/chmln/sd"; From 83e824aa3c55384435bf557ef099456b30ec93dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jul 2021 09:39:19 +0200 Subject: [PATCH 47/75] age: 1.0.0-rc.1 -> 1.0.0-rc.3 --- pkgs/tools/security/age/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index e15618da3f18..20735c6e5782 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-rc.1"; - vendorSha256 = "1qx6pkhq00y0lsi6f82g8hxxh65zk1c0ls91ap6hdlj7ch79bhl2"; + version = "1.0.0-rc.3"; + vendorSha256 = "sha256-sXUbfxhPmJXO+KgV/dmWmsyV49Pb6CoJLbt50yVgEvI="; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "1n25wip4qnd3v9ial1apc2ybx10b9z6lwz7flyss6kvj3x5g9jd1"; + sha256 = "sha256-YXdCTK9/eMvcHWg7gQQiPlLWYx2OjbOJDDNdSYO09HU="; }; meta = with lib; { From 988daa56af643540cc178b5e1f2afbaa1b931482 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 07:54:38 +0000 Subject: [PATCH 48/75] kubeconform: 0.4.7 -> 0.4.8 --- pkgs/applications/networking/cluster/kubeconform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index c62cbb2a67a7..cc0f1e0bf64c 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ahVdKMx3u2KnJ30wi9rV8JCVg9wPmbgdrtG8IpWWlCs="; + sha256 = "sha256-XD8xGqtE7eaBxPL4Z0Kw4BEqM2fdgww7wl8wJ1U3u0U="; }; vendorSha256 = null; From d9eabcd4d9379143e7bd74362724ccffcfbf16f3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Jul 2021 10:06:27 +0200 Subject: [PATCH 49/75] python3Packages.libarcus: 4.9.0 -> 4.10.0 --- pkgs/development/python-modules/libarcus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index a48d70c544c3..7b0b09dcb14c 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.9.0"; + version = "4.10.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "0wq72nf680bwxijjajb4piw563rnvflshmw96kqln4lsny7ydjj2"; + sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf"; }; disabled = pythonOlder "3.4.0"; From 53dd84030fe4b4216055dfeb4fc0d61a6350dd2c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Jul 2021 10:06:42 +0200 Subject: [PATCH 50/75] python3Packages.libsavitar: 4.9.0 -> 4.10.0 --- pkgs/development/python-modules/libsavitar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 7ecd09160fff..e82400b565fd 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.9.0"; + version = "4.10.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "0434cb19v9phc9xicbmgpbig18ivplcpqhnsjgca4p8n8c715k9h"; + sha256 = "1zyzsrdm5aazv12h7ga35amfryrbxdsmx3abvh27hixyh9f92fdp"; }; postPatch = '' From 55bfa33044c6dbe411ee67d1a1c1aea99078bf7f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Jul 2021 10:07:01 +0200 Subject: [PATCH 51/75] python3Packages.pynest2d: 4.8.0 -> 4.10.0 --- pkgs/development/python-modules/pynest2d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index f3b5b9ba6854..5d6a006634e2 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -2,7 +2,7 @@ , pythonOlder, libnest2d, sip_4, clipper }: buildPythonPackage rec { - version = "4.8.0"; + version = "4.10.0"; pname = "pynest2d"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "pynest2d"; rev = version; - sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp"; + sha256 = "03aj0whxj9rs9nz3idld7w4vpmnr6vr40vpwmzcf5w2pi2n4z4lk"; }; propagatedBuildInputs = [ libnest2d sip_4 clipper ]; From 5facfea9ff6cc788ae0ea8ac38f64e21e493df17 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Jul 2021 10:07:19 +0200 Subject: [PATCH 52/75] python3Packages.uranium: 4.9.0 -> 4.10.0 --- pkgs/development/python-modules/uranium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index db8c8c8bd23b..a8ce6713f2c0 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.9.0"; + version = "4.10.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "0bqrc4g4pd7b209swlv06bm5sx7df96h9kjpqpra4mfz469km4nn"; + sha256 = "0bxbkqc4ajs52vmalmhvvqvl1aw2ss6yf7nclwx8nc2g5vchd4ng"; }; disabled = pythonOlder "3.5.0"; From 84a05811ae853d12d31a17b37dc6bd39bc5981e3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Jul 2021 10:07:36 +0200 Subject: [PATCH 53/75] cura: 4.9.0 -> 4.10.0 --- pkgs/applications/misc/cura/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index a33cb7b2ce6c..32b9085b3de2 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -3,20 +3,20 @@ mkDerivation rec { pname = "cura"; - version = "4.9.0"; + version = "4.10.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "1q515qwrzla3ikbsjmk91y0nrbwih11jycgmd50lkrmnkh7qj0r2"; + sha256 = "0v65xg31rw4kc7f98k8zz0kmhrp9m55k8ahblha9r1vr4krcf30z"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "0hi9w1fsnazlr0vvxdr3alsdb8m1vjjfp5zhmlz4kyyxhsy3bc33"; + sha256 = "0ykf14j4yx4cf12qw0d4bff9ixrx96m6wxqvi83sn721y7dsd2rs"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; From 8f34bdf93a8afc4b6e950189d90b56b4ae0c0076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 4 Jul 2021 10:25:21 +0200 Subject: [PATCH 54/75] redo-c: 0.2 -> 0.3 --- pkgs/development/tools/build-managers/redo-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/development/tools/build-managers/redo-c/default.nix index 40708b7877a9..14d33cba0395 100644 --- a/pkgs/development/tools/build-managers/redo-c/default.nix +++ b/pkgs/development/tools/build-managers/redo-c/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "redo-c"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = pname; rev = "v${version}"; - sha256 = "11wc2sgw1ssdm83cjdc6ndnp1bv5mzhbw7njw47mk7ri1ic1x51b"; + sha256 = "sha256-oZcaBgESIaD7/SUBE7luh7axucKTEzXPVkQAQs2NCXE="; }; postPatch = '' From db37a86453abb88c8b35924a9392f31a936597d0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Jul 2021 10:35:17 +0200 Subject: [PATCH 55/75] ccls: set resource directory Fixes #126936 --- pkgs/development/tools/misc/ccls/wrapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/ccls/wrapper b/pkgs/development/tools/misc/ccls/wrapper index c92bc6b40d1a..294b60893a3f 100644 --- a/pkgs/development/tools/misc/ccls/wrapper +++ b/pkgs/development/tools/misc/ccls/wrapper @@ -4,6 +4,6 @@ printf -v extraArgs ',\"%s\"' \ $(cat @clang@/nix-support/libc-cflags \ @clang@/nix-support/libcxx-cxxflags) \ ${NIX_CFLAGS_COMPILE} -initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}]}}" +initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}],\"resourceDir\":\"@clang@/resource-root\"}}" exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@" From 3325aaacf0fafb527ae2a7da37f6a132fe15b970 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Jul 2021 10:41:16 +0200 Subject: [PATCH 56/75] libqalculate: 3.18.0 -> 3.19.0 --- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 45b79571b43a..9368469f26dd 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-cQNcKa/mEdeH1MaLhj203MOphfYDTQ5pn/GzUmSZGcE="; + sha256 = "1w44407wb552q21dz4m2nwwdi8b9hzjb2w1l3ffsikzqckc7wbyj"; }; outputs = [ "out" "dev" "doc" ]; From 5fd14f54c7bb1cca0a39d37994b5cfb8e7195ca9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Jul 2021 10:41:23 +0200 Subject: [PATCH 57/75] qalculate-gtk: 3.18.0 -> 3.19.0 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 56b6df94e8fb..7807ae613e8c 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-hE0di7B6dCnMmMBLgFkb6vPS4hS/7zD6BbviIucrn1I="; + sha256 = "1nrx7gp6f1yalbdda1gb97azhbr4xclq2xf08vvbvsk8jfd6fd2v"; }; hardeningDisable = [ "format" ]; From f69522b22745fcb808835a1f4c25d533bc46943d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 4 Jul 2021 12:07:47 +0200 Subject: [PATCH 58/75] clang-tools: fix missing extra tools fixes https://github.com/NixOS/nixpkgs/issues/128909 --- pkgs/development/compilers/llvm/12/clang/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index dbd6ea1e1ac4..87cdca834ea7 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -17,6 +17,9 @@ let mv clang-* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} + mv clang-tools-extra-* $sourceRoot/tools/extra + substituteInPlace $sourceRoot/tools/extra/clangd/quality/CompletionModel.cmake \ + --replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra' ''; nativeBuildInputs = [ cmake python3 ] From d6d304cd1246e2a1a302490cc0399ce3efc1681a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jun 2021 19:51:14 +0000 Subject: [PATCH 59/75] erlang: 24.0.2 -> 24.0.3 --- pkgs/development/interpreters/erlang/R24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index a4fe839bff4c..7f4b49c5c322 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.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 = "24.0.2"; - sha256 = "gAiQc+AVj5xjwAnn9mF4xprjZOft1JvfEFVJMG5isxg="; + version = "24.0.3"; + sha256 = "KVMISrWNBkk+w37gB4M5TQkgm4odZ+GqLvKN4stzOUI="; } From a3703d72c57b7a2ef9de99630ab64f0b1dec59a3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 11:05:15 +0000 Subject: [PATCH 60/75] cargo-bloat: 0.10.0 -> 0.10.1 --- pkgs/development/tools/rust/cargo-bloat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index c0baf9f39645..549c3d11e3ac 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "0bqzzh8vfqm7dpnb0fv4calnhsg9p3c5j06ycvg621p4zp4fydh2"; + sha256 = "sha256-VcdZ/dKqFFQs8ItNEj407z1pWJqpHwwIsuNnsQ8KU/8="; }; - cargoSha256 = "0f7hmwrs99qdvhn4lvs8cqva68w2y04fy3ca1xlhk7ncdmclcc4g"; + cargoSha256 = "sha256-1TIGv0yVhkhThqZiQW9JrvFd0eouTlr8kgN/g7b4vDM="; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; From e1f7f6df68e3d72d74bfdc4b46a29340a1283c7d Mon Sep 17 00:00:00 2001 From: "a@b.co" Date: Thu, 30 Jan 2020 12:35:43 +0530 Subject: [PATCH 61/75] qjournalctl: init at 0.6.3 --- .../system/qjournalctl/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/system/qjournalctl/default.nix diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix new file mode 100644 index 000000000000..31c256f46c8e --- /dev/null +++ b/pkgs/applications/system/qjournalctl/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, qtbase +, qmake +, pkg-config +, libssh +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "qjournalctl"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "pentix"; + repo = pname; + rev = "v${version}"; + sha256 = "0j27cmfq29mwrbjfrrwi6m1grcamhbfhk47xzlfsx5wr2q9m6qkz"; + }; + + postPatch = '' + substituteInPlace qjournalctl.pro --replace /usr/ $out/ + ''; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + libssh + qtbase + ]; + + meta = with lib; { + description = "Qt-based graphical user interface for systemd's journalctl command"; + homepage = "https://github.com/pentix/qjournalctl"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ dtzWill srgom romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38969dc50f71..4f7a18e91927 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8204,6 +8204,8 @@ in qhull = callPackage ../development/libraries/qhull { }; + qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { }; + qjoypad = callPackage ../tools/misc/qjoypad { }; qmk = callPackage ../tools/misc/qmk { }; From 04f8630f83949b7d8237ddba0a47d8d6ee41419c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 4 Jul 2021 17:01:15 +0200 Subject: [PATCH 62/75] ibus-engines.mozc: 2.23.4206.102 -> 2.26.4423.100 --- .../ibus-engines/ibus-mozc/default.nix | 71 ++++++++++--------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index ea82ccaf96b7..44a44b3af2bf 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,70 +1,64 @@ { lib, stdenv, fetchFromGitHub, which, ninja, pkg-config, protobuf , ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }: -let - japanese_usage_dictionary = fetchFromGitHub { - owner = "hiroyuki-komatsu"; - repo = "japanese-usage-dictionary"; - rev = "e5b3425575734c323e1d947009dd74709437b684"; - sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; - }; -in stdenv.mkDerivation rec { - name = "ibus-mozc-${version}"; - version = "2.23.4206.102"; - - meta = with lib; { - isIbusEngine = true; - description = "Japanese input method from Google"; - homepage = "https://github.com/google/mozc"; - license = licenses.free; - platforms = platforms.linux; - maintainers = with maintainers; [ gebner ericsagnes ]; - }; - - nativeBuildInputs = [ which ninja python3Packages.python python3Packages.six - python3Packages.gyp pkg-config qt5.wrapQtAppsHook ]; - buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; +stdenv.mkDerivation rec { + pname = "ibus-mozc"; + version = "2.26.4423.100"; src = fetchFromGitHub { - owner = "google"; - repo = "mozc"; - rev = "91cc1e19ef34aeb12888b697fefa52907f1a834d"; - sha256 = "1fyy9g1pnaq6s5nkf56aqmp5mgyibbmp1ylc64fqc6g1plg90zk2"; + owner = "google"; + repo = "mozc"; + rev = "7654223979067e3c5ae52ea238d43880c5508f85"; + sha256 = "aZVuhj4I9ZCsVR9dOplOd9zinYMgYw5SF5wG3IxBTO0="; fetchSubmodules = true; }; - postUnpack = '' - rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/ - ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary - '' + lib.optionalString stdenv.isLinux '' + nativeBuildInputs = [ + which ninja python3Packages.python python3Packages.six + python3Packages.gyp pkg-config qt5.wrapQtAppsHook + ]; + + buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; + + postUnpack = lib.optionalString stdenv.isLinux '' sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi ''; configurePhase = '' + runHook preConfigure + export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model" cd src && python build_mozc.py gyp --gypdir=${python3Packages.gyp}/bin --server_dir=$out/lib/mozc + + runHook postConfigure ''; buildPhase = '' + runHook preBuild + PYTHONPATH="$PWD:$PYTHONPATH" python build_mozc.py build -c Release \ unix/ibus/ibus.gyp:ibus_mozc \ unix/emacs/emacs.gyp:mozc_emacs_helper \ server/server.gyp:mozc_server \ gui/gui.gyp:mozc_tool \ renderer/renderer.gyp:mozc_renderer + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -d $out/share/licenses/mozc head -n 29 server/mozc_server.cc > $out/share/licenses/mozc/LICENSE - install -m 644 data/installer/*.html $out/share/licenses/mozc/ + install -m 644 data/installer/*.html $out/share/licenses/mozc/ install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool wrapQtApp $out/lib/mozc/mozc_tool install -d $out/share/doc/mozc - install -m 644 data/installer/*.html $out/share/doc/mozc/ + install -m 644 data/installer/*.html $out/share/doc/mozc/ install -D -m 755 out_linux/Release/ibus_mozc $out/lib/ibus-mozc/ibus-engine-mozc install -D -m 644 out_linux/Release/gen/unix/ibus/mozc.xml $out/share/ibus/component/mozc.xml @@ -79,5 +73,16 @@ in stdenv.mkDerivation rec { install -m 644 data/images/unix/ui-alpha_half.png $out/share/ibus-mozc/alpha_half.png install -m 644 data/images/unix/ui-alpha_full.png $out/share/ibus-mozc/alpha_full.png install -D -m 755 out_linux/Release/mozc_renderer $out/lib/mozc/mozc_renderer + + runHook postInstall ''; + + meta = with lib; { + isIbusEngine = true; + description = "Japanese input method from Google"; + homepage = "https://github.com/google/mozc"; + license = licenses.free; + platforms = platforms.linux; + maintainers = with maintainers; [ gebner ericsagnes ]; + }; } From 4bc9ad7a75a9b14b07039a4c4412ecc84f2fc0d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jul 2021 17:03:07 +0200 Subject: [PATCH 63/75] python3Packages.scp: 0.13.4 -> 0.13.5 --- pkgs/development/python-modules/scp/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index e0c6769b07d7..7bd426706886 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.13.4"; + version = "0.13.5"; src = fetchPypi { inherit pname version; - sha256 = "e60948dd3e1aa13da21aa1bf8a025fabbbc2816ed04f1a1272410247d1a86f15"; + sha256 = "sha256-CrLukXi4vlPcXJ/i8zdh4BokNQh/XJ+1tUUZhzxlDWA="; }; propagatedBuildInputs = [ @@ -25,10 +25,12 @@ buildPythonPackage rec { #The Pypi package doesn't include the test doCheck = false; + pythonImportsCheck = [ "scp" ]; + meta = with lib; { homepage = "https://github.com/jbardin/scp.py"; description = "SCP module for paramiko"; - license = licenses.lgpl3; + license = licenses.lgpl21Only; maintainers = with maintainers; [ xnaveira ]; }; } From 228adbbf7151ba2aad2cc8a4f103001d2bd20107 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jul 2021 17:52:29 +0200 Subject: [PATCH 64/75] tcpdump: 4.99.0 -> 4.99.1 --- pkgs/tools/networking/tcpdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index f1fe05276396..6726e5b751ab 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpdump"; - version = "4.99.0"; + version = "4.99.1"; src = fetchurl { url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - sha256 = "0hmqh2fx8rgs9v1mk3vpywj61xvkifz260q685xllxr8jmxg3wlc"; + sha256 = "sha256-ebNphfsnAxRmGNh8Ss3j4Gi5HFU/uT8CGjN/F1/RDr4="; }; postPatch = '' From 26c36ab58695188b07eb8539083390886fd7921a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 15:52:49 +0000 Subject: [PATCH 65/75] exploitdb: 2021-07-02 -> 2021-07-03 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index bcc27c81f556..bfcd1f81768f 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-02"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-p6D0FM52SF4fnWXa/zpewr+lNWC4hZWc0yAQYnioUdQ="; + sha256 = "sha256-q+p4OnDs7T4bfCgKg4KBRwNyutULSItFATBE/ECG8N4="; }; installPhase = '' From 71bfa1cb898c2eae7fbe2e3cc493a86e1a03cbc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jul 2021 18:16:10 +0200 Subject: [PATCH 66/75] ncdu: 1.15.1 -> 1.16 --- pkgs/tools/misc/ncdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 1237645ebaec..66429f338ac1 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "1.15.1"; + version = "1.16"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "1c1zxalm5asyhn4p1hd51h7khw17515gbqmvdz63kc8xpx6xqbdh"; + sha256 = "1m0gk09jaz114piidiw8fkg0id5l6nhz1cg5nlaf1yl3l595g49b"; }; buildInputs = [ ncurses ]; From b95cd0fcd86924ccc0715196ff4bcd44fabb78bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 4 Jul 2021 19:35:06 +0200 Subject: [PATCH 67/75] python-aliases: dtfit, lammps-cython --- pkgs/top-level/python-aliases.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 124a9533dccd..887ae8a149a2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -38,6 +38,7 @@ mapAliases ({ dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 diff_cover = diff-cover; # added 2021-07-02 + dftfit = throw "it's dependency lammps-cython no longer builds"; dns = dnspython; # Alias for compatibility, 2017-12-10 faulthandler = throw "faulthandler is built into ${python.executable}"; gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 @@ -45,6 +46,7 @@ mapAliases ({ google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 HAP-python = hap-python; # added 2021-06-01 + lammps-cython = throw "no longer builds and is unmaintained"; MechanicalSoup = mechanicalsoup; # added 2021-06-01 privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 From b07b9e81bcf668176662766de1c19170f57bd69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 4 Jul 2021 19:39:05 +0200 Subject: [PATCH 68/75] redo: Set CFLAGS only if not defined --- pkgs/development/tools/build-managers/redo-c/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/redo-c/Makefile b/pkgs/development/tools/build-managers/redo-c/Makefile index f2c43cc5003c..5a1dd74c5b84 100644 --- a/pkgs/development/tools/build-managers/redo-c/Makefile +++ b/pkgs/development/tools/build-managers/redo-c/Makefile @@ -1,4 +1,4 @@ -CFLAGS=-Os +CFLAGS ?= -Os all: redo links From 30200ce8e1ec62c82730e06287de746eda54900c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 25 Jun 2021 18:42:54 +0200 Subject: [PATCH 69/75] bmake: 20210420 -> 20210621 --- pkgs/development/tools/build-managers/bmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index a93de053c446..56e62ad99a93 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20210420"; + version = "20210621"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "1ajq8v5rq3pl5y9h1hlscs83007fsyk3lhcp87z09ma370lm3ra7"; + sha256 = "0gpzv75ibzqz1j1h0hdjgx1v7hkl3i5cb5yf6q9sfcgx0bvb55xa"; }; # Make tests work with musl From 32c42d37ab6d45388fc713fe8312a50eade3d4b3 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 25 Jun 2021 18:44:16 +0200 Subject: [PATCH 70/75] bmake: test musl build Since we do some additional patching to make it work with musl, we should also test that, so we can _keep_ it working. --- pkgs/development/tools/build-managers/bmake/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 56e62ad99a93..11bc58897023 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch , getopt, tzdata +, pkgsMusl # for passthru.tests }: stdenv.mkDerivation rec { @@ -79,6 +80,10 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + passthru.tests = { + bmakeMusl = pkgsMusl.bmake; + }; + meta = with lib; { description = "Portable version of NetBSD 'make'"; homepage = "http://www.crufty.net/help/sjg/bmake.html"; From 2019f82e3ee5764ae2d63a53ef5a44310b7c7f77 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 4 Jul 2021 19:16:06 +0200 Subject: [PATCH 71/75] bmake: enable ksh test on non musl platforms bmake runs the ksh test if /bin/ksh exists. This is never a good indication on platforms where we can sandbox and causes problems on darwin where this path may exist, but never would be in PATH. We solve this problem by always enabling the test and adding ksh to checkInputs. ksh doesn't seem to compile with musl, so we disable it on that platform. --- .../tools/build-managers/bmake/default.nix | 15 ++++++++++++--- .../bmake/unconditional-ksh-test.patch | 12 ++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 11bc58897023..0d8ca351096c 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch -, getopt, tzdata +, getopt, tzdata, ksh , pkgsMusl # for passthru.tests }: @@ -14,9 +14,12 @@ stdenv.mkDerivation rec { # Make tests work with musl # * Disable deptgt-delete_on_error test (alpine does this too) + # * Disable shell-ksh test (ksh doesn't compile with musl) # * Fix test failing due to different strerror(3) output for musl and glibc postPatch = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - sed -i unit-tests/Makefile -e '/deptgt-delete_on_error/d' + sed -i unit-tests/Makefile \ + -e '/deptgt-delete_on_error/d' \ + -e '/shell-ksh/d' substituteInPlace unit-tests/opt-chdir.exp --replace "File name" "Filename" ''; @@ -29,6 +32,8 @@ stdenv.mkDerivation rec { ./fix-unexport-env-test.patch # Fix localtime tests without global /etc/zoneinfo directory ./fix-localtime-test.patch + # Always enable ksh test since it checks in a impure location /bin/ksh + ./unconditional-ksh-test.patch # decouple tests from build phase (fetchpatch { name = "separate-tests.patch"; @@ -69,7 +74,11 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkInputs = [ tzdata ]; + checkInputs = [ + tzdata + ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ + ksh + ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch b/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch new file mode 100644 index 000000000000..117b85da16d1 --- /dev/null +++ b/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch @@ -0,0 +1,12 @@ +--- bmake/unit-tests/Makefile.orig 2021-07-04 19:13:09.068094922 +0200 ++++ bmake/unit-tests/Makefile 2021-07-04 19:13:14.630080696 +0200 +@@ -295,9 +295,7 @@ + TESTS+= sh-single-line + TESTS+= shell-csh + TESTS+= shell-custom +-.if exists(/bin/ksh) + TESTS+= shell-ksh +-.endif + TESTS+= shell-sh + TESTS+= suff-add-later + TESTS+= suff-clear-regular From 45abf2f0d0c8077dae322e2b7fa92b3ca1f034aa Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Sun, 4 Jul 2021 18:47:24 +0200 Subject: [PATCH 72/75] nixos/manual: prompt to set root password has changed The manual mentions in https://nixos.org/manual/nixos/stable/index.html#sec-installation-installing: ``` setting root password... Enter new UNIX password: *** Retype new UNIX password: *** ``` However, in the terminal I got: ``` setting root password... New password: *** Retype new password: *** ``` --- nixos/doc/manual/installation/installing.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index f03b9443d23b..d019bb318096 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -446,8 +446,8 @@ password for the root user, e.g. setting root password... -Enter new UNIX password: *** -Retype new UNIX password: *** +New password: *** +Retype new password: *** For unattended installations, it is possible to use From 5db6b909cd0e544a5466fb0279d6aeaf202b0cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 4 Jul 2021 20:52:48 +0200 Subject: [PATCH 73/75] strings.nix: Fix overly monomorphic type signature comments These functions work on lists of anything, not just lists of strings. --- lib/strings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 49fa0196a0b2..86c92bdaa15b 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -95,7 +95,7 @@ rec { result with the specified separator interspersed between elements. - Type: concatMapStringsSep :: string -> (string -> string) -> [string] -> string + Type: concatMapStringsSep :: string -> (a -> string) -> [a] -> string Example: concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"] @@ -112,7 +112,7 @@ rec { /* Same as `concatMapStringsSep`, but the mapping function additionally receives the position of its argument. - Type: concatIMapStringsSep :: string -> (int -> string -> string) -> [string] -> string + Type: concatIMapStringsSep :: string -> (int -> a -> string) -> [a] -> string Example: concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ] From e2a11c1d3d0d66bf09c5038977ac7e0d7c0ef8cc Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 4 Jul 2021 16:20:21 +0200 Subject: [PATCH 74/75] koka: 2.1.4 -> 2.1.9 --- pkgs/development/compilers/koka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 30e273271ae3..0b88bc1ab1c9 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -4,12 +4,12 @@ , parsec, process, regex-compat, text, time }: let - version = "2.1.4"; + version = "2.1.9"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-MPMA8ZErEKv1SrkliLsy35k88GrdsPqIK6yokQreIjE="; + sha256 = "0xny4x1a2lzwgmng60bni7rxfjx5ns70qbfp703qwms54clvj5wy"; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { From 8c44a664678c22d46e8ce2f91ce96c644a58f036 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 22:09:59 +0000 Subject: [PATCH 75/75] kea: 1.9.8 -> 1.9.9 --- pkgs/tools/networking/kea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 8daa2f10d7e1..e852fdb1c2d4 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-EAi1Ic3YEF0or37At48saKwmAczTwf5GtbEsQNopbl0="; + sha256 = "sha256-iVSWBR1+SkXlkwMii2PXpcxFSXYigz4lfNnMZBvS2kM="; }; patches = [ ./dont-create-var.patch ];