Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-04 12:01:06 +00:00 committed by GitHub
commit a6fdcf8d52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 804 additions and 794 deletions

View file

@ -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 ];

View file

@ -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/";

View file

@ -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

View file

@ -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 ];
};
}

View file

@ -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;

View file

@ -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"
},

File diff suppressed because it is too large Load diff

View file

@ -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";
};
}
{

View file

@ -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 ];

View file

@ -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;

View file

@ -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 ];

View file

@ -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" ];

View file

@ -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=";
}

View file

@ -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" ];

View file

@ -19,11 +19,15 @@
, x11Support? !stdenv.isDarwin, libXft
}:
let
withDocs = stdenv.buildPlatform == stdenv.hostPlatform;
in
stdenv.mkDerivation rec {
pname = "pango";
version = "1.48.5";
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"

View file

@ -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";

View file

@ -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 = ''

View file

@ -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 ];

View file

@ -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";

View file

@ -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; {

View file

@ -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}" "$@"

View file

@ -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=";

View file

@ -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=";

View file

@ -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 ];
};
}

View file

@ -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";

View file

@ -2952,6 +2952,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 { };