diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 99a75fa6bfea..3c50a9c5b8d8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7995,6 +7995,12 @@ githubId = 19036; name = "Matthew Bauer"; }; + matthiasbenaets = { + email = "matthias.benaets@gmail.com"; + github = "MatthiasBenaets"; + githubId = 89214559; + name = "Matthias Benaets"; + }; matthiasbeyer = { email = "mail@beyermatthias.de"; matrix = "@musicmatze:beyermatthi.as"; @@ -10188,6 +10194,12 @@ githubId = 10473184; name = "Jia Xiaodong"; }; + polarmutex = { + email = "brian@brianryall.xyz"; + github = "polarmutex"; + githubId = 115141; + name = "Brian Ryall"; + }; polendri = { email = "paul@ijj.li"; github = "polendri"; diff --git a/nixos/modules/hardware/new-lg4ff.nix b/nixos/modules/hardware/new-lg4ff.nix new file mode 100644 index 000000000000..46581e478640 --- /dev/null +++ b/nixos/modules/hardware/new-lg4ff.nix @@ -0,0 +1,28 @@ +{ pkgs, lib, config, ... }: + +with lib; + +let + cfg = config.hardware.new-lg4ff; +in { + options.hardware.new-lg4ff = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables improved Linux module drivers for Logitech driving wheels. + This will replace the existing in-kernel hid-logitech modules. + Works most notably on the Logitech G25, G27, G29 and Driving Force (GT). + ''; + }; + }; + + config = { + boot = { + extraModulePackages = [ pkgs.new-lg4ff ]; + kernelModules = [ "hid-logitech-new" ]; + }; + }; + + meta.maintainers = with lib.maintainers; [ matthiasbenaets ]; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 81b386999703..902fffd60f9b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -66,6 +66,7 @@ ./hardware/network/ath-user-regd.nix ./hardware/network/b43.nix ./hardware/network/intel-2200bg.nix + ./hardware/new-lg4ff.nix ./hardware/nitrokey.nix ./hardware/opengl.nix ./hardware/openrazer.nix diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index 04cf82f8a46b..789b78702e9b 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -53,7 +53,10 @@ in User = cfg.user; Group = cfg.group; StateDirectory = "jellyfin"; + StateDirectoryMode = "0700"; CacheDirectory = "jellyfin"; + CacheDirectoryMode = "0700"; + UMask = "0077"; ExecStart = "${cfg.package}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'"; Restart = "on-failure"; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 84f6df6350f6..c1b5c04e1fb0 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,16 +2,15 @@ let pname = "ledger-live-desktop"; - version = "2.41.3"; - name = "${pname}-${version}"; + version = "2.42.0"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-Bh3wB5AAgY6l1W3UtWUHW+lJgJ0w6gw23WvEe3/Xs1g="; + hash = "sha256-LhpZ2aTPT3XJWeWsl7MCbFsgwSqTHfpdRJD9SveIqQg="; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; # Hotplug events from udevd are fired into the kernel, which then re-broadcasts them over a @@ -25,12 +24,12 @@ let }); in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; extraPkgs = pkgs: [ systemdPatched ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png diff --git a/pkgs/applications/misc/moz-phab/default.nix b/pkgs/applications/misc/moz-phab/default.nix index 886e06a382bd..67b8f9e09312 100644 --- a/pkgs/applications/misc/moz-phab/default.nix +++ b/pkgs/applications/misc/moz-phab/default.nix @@ -5,6 +5,7 @@ # build inputs , distro , glean-sdk +, pip , python-hglib , sentry-sdk , setuptools @@ -30,6 +31,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ distro glean-sdk + pip python-hglib sentry-sdk setuptools diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 9d432556b9e5..b5de0b059a8e 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-lJJZ0ZsPTPEaYyzi8chAPo1OlZQ6p9QVqwtSOyJD7W4="; + sha256 = "sha256-cpBMzYLcU93GXYkBhUdoRovjQ2hd1+pAt6d9aAOaZT8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index ce16dcb61739..25731fea4fb7 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "sha256-NtmpXYC4JBbL5wW1yp5g7In8NZC4N6nvBaoUUcGs15Y="; + sha256 = "sha256-tAYFuxB8LSyFHraAQxCj8Q09mS/9RYcinVm5whpRh04="; }; - vendorSha256 = "sha256-+4HBWMaENG1NgUsFzN1uxyDbWOOiFba/ybWV7152g84="; + vendorSha256 = "sha256-IFxKczPrqCM9NOoOJayfbrsJIMf3eoI9zXSFns0/i8o="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 66d8028c2aca..9f13914474c1 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members; platforms = platforms.linux ++ platforms.darwin; + broken = stdenv.isDarwin && stdenv.isAarch64; mainProgram = "gp"; }; } diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 8186f8810e56..58db9273b83c 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -28,14 +28,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.25.0"; + version = "0.25.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-RYQVcbyKIv/FlrtROoQywWR+iF+4KYiYrrzErUrOCWM="; + sha256 = "sha256-wL631cbA6ffXZomi6iDHk7XerRlpIL6T2qlEiQvFSJY="; }; buildInputs = [ @@ -78,23 +78,42 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; patches = [ - # Required to get `test_ssh_env_vars` to pass. - (fetchpatch { - name = "increase-pty-lines.patch"; - url = "https://github.com/kovidgoyal/kitty/commit/eb84990f5a8edc458e04d24cc1cda05316d74ceb.patch"; - sha256 = "sha256-eOANfhGPMoN4FqxtIGDBu5X0O3RPLABDnL+LKqSLROI="; - }) # Fix to ensure that files in tar files used by SSH kitten have write permissions. - ./tarball-restore-write-permissions.patch + (fetchpatch { + name = "fix-tarball-file-permissions.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/8540ca399053e8d42df27283bb5dd4af562ed29b.patch"; + sha256 = "sha256-y5w+ritkR+ZEfNSRDQW9r3BU2qt98UNK7vdEX/X+mKU="; + }) + + # Remove upon next release. Needed because of a missing #define. + (fetchpatch { + name = "fontconfig-1.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/bec620a8d30c36453e471b140b07483c7f875bf4.patch"; + sha256 = "sha256-r1OTcXdO+RUAXmmIqI07m+z0zXq8DXCzgBRXPpnkGGM="; + }) + (fetchpatch { + name = "fontconfig-2.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/1283a2b7e552d30cabce9345e5c13e5f9079183d.patch"; + sha256 = "sha256-UM/OsumnfVHuHTahpRwyWZOeu6L8WOwbBf3lcjwdTj8="; + }) + (fetchpatch { + name = "fontconfig-3.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/5c4abe749b1f50ae556a711d24ac7f3e384fac4e.patch"; + sha256 = "sha256-amvyv5cZxHGPg7dZv649WjH4MNloFbmz5D4rhjKNzYA="; + }) # Needed on darwin # Gets `test_ssh_shell_integration` to pass for `zsh` when `compinit` complains about # permissions. ./zsh-compinit.patch - # Skip `test_ssh_login_shell_detection` in some cases, build users have their shell set to - # `/sbin/nologin` which causes issues. - ./disable-test_ssh_login_shell_detection.patch + + # Skip login shell detection when login shell is set to nologin + (fetchpatch { + name = "skip-login-shell-detection-for-nologin.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/27906ea853ce7862bcb83e324ef80f6337b5d846.patch"; + sha256 = "sha256-Zg6uWkiWvb45i4xcp9k6jy0R2IQMT4PXr7BenzZ/md8="; + }) # Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes: # OSError: master_fd is in error condition ./disable-test_ssh_bootstrap_with_different_launchers.patch @@ -122,6 +141,7 @@ buildPythonApplication rec { --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ --canberra-library='${libcanberra}/lib/libcanberra.so' \ + --fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \ ${commonOptions} ''} runHook postBuild @@ -203,7 +223,6 @@ buildPythonApplication rec { passthru.tests.test = nixosTests.terminal-emulators.kitty; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://github.com/kovidgoyal/kitty"; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3Only; diff --git a/pkgs/applications/terminal-emulators/kitty/disable-test_ssh_login_shell_detection.patch b/pkgs/applications/terminal-emulators/kitty/disable-test_ssh_login_shell_detection.patch deleted file mode 100644 index c6301f0de72f..000000000000 --- a/pkgs/applications/terminal-emulators/kitty/disable-test_ssh_login_shell_detection.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kitty_tests/ssh.py b/kitty_tests/ssh.py -index 1f424146..57620334 100644 ---- a/kitty_tests/ssh.py -+++ b/kitty_tests/ssh.py -@@ -197,7 +197,7 @@ def test_ssh_login_shell_detection(self): - expected_login_shell = pwd.getpwuid(os.geteuid()).pw_shell - for m in methods: - for sh in self.all_possible_sh: -- if 'python' in sh: -+ if 'python' in sh or '/sbin/nologin' in expected_login_shell: - continue - with self.subTest(sh=sh, method=m), tempfile.TemporaryDirectory() as tdir: - pty = self.check_bootstrap(sh, tdir, test_script=f'{m}; echo "$login_shell"; exit 0', SHELL_INTEGRATION_VALUE='') diff --git a/pkgs/applications/terminal-emulators/kitty/tarball-restore-write-permissions.patch b/pkgs/applications/terminal-emulators/kitty/tarball-restore-write-permissions.patch deleted file mode 100644 index 59253bbc4d33..000000000000 --- a/pkgs/applications/terminal-emulators/kitty/tarball-restore-write-permissions.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 59f6876187da2c01b35e696e169ca98239c08a41 Mon Sep 17 00:00:00 2001 -From: Jason Felice -Date: Tue, 24 May 2022 07:54:25 -0400 -Subject: [PATCH] Restore write permissions in tarball - -In Nix, the source files are stored in an immutable store and -therefore have been stripped of write permissions. When the SSH -kitten makes the tarfile, the files contained in it are also missing -the write permissions, causing commands on the remote side to fail. ---- - kittens/ssh/main.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kittens/ssh/main.py b/kittens/ssh/main.py -index 0b50d5ff..f80ac13d 100644 ---- a/kittens/ssh/main.py -+++ b/kittens/ssh/main.py -@@ -123,6 +123,7 @@ def make_tarfile(ssh_opts: SSHOptions, base_env: Dict[str, str], compression: st - def normalize_tarinfo(tarinfo: tarfile.TarInfo) -> tarfile.TarInfo: - tarinfo.uname = tarinfo.gname = '' - tarinfo.uid = tarinfo.gid = 0 -+ tarinfo.mode |= 0o200 - return tarinfo - - def add_data_as_file(tf: tarfile.TarFile, arcname: str, data: Union[str, bytes]) -> tarfile.TarInfo: --- -2.36.0 diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 5da81eff50e6..edc084ef6a0f 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -1,64 +1,134 @@ -{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch -, cairo, ffmpeg, sox, xdg-utils, texlive -, colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub -, pbr, fetchPypi -}: -buildPythonApplication rec { - pname = "manim"; - version = "0.1.10"; +{ lib +, fetchFromGitHub - src = fetchPypi { - pname = "manimlib"; - inherit version; - sha256 = "0vg9b3rwypq5zir74pi0pmj47yqlcg7hrvscwrpjzjbqq2yihn49"; +, cairo +, ffmpeg +, texlive + +, python3 +}: + +let + # According to ManimCommunity documentation manim uses tex-packages packaged + # in a custom distribution called "manim-latex", + # + # https://community.chocolatey.org/packages/manim-latex#files + # + # which includes another cutom distribution called tinytex, for which the + # package list can be found at + # + # https://github.com/yihui/tinytex/blob/master/tools/pkgs-custom.txt + # + # these two combined add up to: + manim-tinytex = { + inherit (texlive) + + # tinytex + scheme-infraonly amsfonts amsmath atbegshi atveryend auxhook babel bibtex + bigintcalc bitset booktabs cm dehyph dvipdfmx dvips ec epstopdf-pkg etex + etexcmds etoolbox euenc everyshi fancyvrb filehook firstaid float fontspec + framed geometry gettitlestring glyphlist graphics graphics-cfg graphics-def + grffile helvetic hycolor hyperref hyph-utf8 iftex inconsolata infwarerr + intcalc knuth-lib kvdefinekeys kvoptions kvsetkeys l3backend l3kernel + l3packages latex latex-amsmath-dev latex-bin latex-fonts latex-tools-dev + latexconfig latexmk letltxmacro lm lm-math ltxcmds lua-alt-getopt luahbtex + lualatex-math lualibs luaotfload luatex mdwtools metafont mfware natbib + pdfescape pdftex pdftexcmds plain psnfss refcount rerunfilecheck stringenc + tex tex-ini-files times tipa tools unicode-data unicode-math uniquecounter + url xcolor xetex xetexconfig xkeyval xunicode zapfding + + # manim-latex + standalone everysel preview doublestroke ms setspace rsfs relsize ragged2e + fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super + babel-english gnu-freefont mathastext cbfonts-fd; + }; +in python3.pkgs.buildPythonApplication rec { + pname = "manim"; + format = "pyproject"; + version = "0.15.2"; + disabled = python3.pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ManimCommunity"; + repo = pname; + rev = "v${version}"; + sha256 = "l5JiFWCMQbGnwRRtYzCHBXdVzWBrTNPdcIYaAt/wRNA="; }; - patches = [ ./remove-dependency-constraints.patch ]; - - nativeBuildInputs = [ pbr ]; - - propagatedBuildInputs = [ - colour - numpy - pillow - progressbar - scipy - tqdm - opencv - pycairo - pydub - - cairo sox ffmpeg xdg-utils + nativeBuildInputs = [ + python3.pkgs.poetry-core ]; - # Test with texlive to see whether it works but don't propagate - # because it's huge and optional - # TODO: Use smaller TexLive distribution - # Doesn't need everything but it's hard to figure out what it needs - checkInputs = [ cairo sox ffmpeg xdg-utils texlive.combined.scheme-full ]; - - # Simple test and complex test with LaTeX - checkPhase = '' - for scene in SquareToCircle OpeningManimExample - do - python3 manim.py example_scenes.py $scene -l - tail -n 20 files/Tex/*.log # Print potential LaTeX erorrs - ${file}/bin/file videos/example_scenes/480p15/$scene.mp4 \ - | tee | grep -F "ISO Media, MP4 Base Media v1 [ISO 14496-12:2003]" - done + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'cloup = "^0.13.0"' 'cloup = "*"' \ + --replace 'mapbox-earcut = "^0.12.10"' 'mapbox-earcut = "*"' \ ''; - disabled = pythonOlder "3.7"; + buildInputs = [ cairo ]; - meta = { - description = "Animation engine for explanatory math videos"; + propagatedBuildInputs = with python3.pkgs; [ + click + click-default-group + cloup + colour + grpcio + grpcio-tools + importlib-metadata + isosurfaces + jupyterlab + manimpango + mapbox-earcut + moderngl + moderngl-window + networkx + numpy + pillow + pycairo + pydub + pygments + pysrt + rich + scipy + screeninfo + skia-pathops + srt + tqdm + watchdog + ]; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ + ffmpeg + (texlive.combine manim-tinytex) + ]) + ]; + + + checkInputs = [ + python3.pkgs.pytest-cov + python3.pkgs.pytest-xdist + python3.pkgs.pytestCheckHook + + ffmpeg + (texlive.combine manim-tinytex) + ]; + + # about 55 of ~600 tests failing mostly due to demand for display + disabledTests = import ./failing_tests.nix; + + pythonImportsCheck = [ "manim" ]; + + meta = with lib; { + description = "Animation engine for explanatory math videos - Community version"; longDescription = '' Manim is an animation engine for explanatory math videos. It's used to create precise animations programmatically, as seen in the videos of - 3Blue1Brown on YouTube. + 3Blue1Brown on YouTube. This is the community maintained version of + manim. ''; - homepage = "https://github.com/3b1b/manim"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ johnazoidberg ]; + homepage = "https://github.com/ManimCommunity/manim"; + license = licenses.mit; + maintainers = with maintainers; [ friedelino ]; }; } diff --git a/pkgs/applications/video/manim/failing_tests.nix b/pkgs/applications/video/manim/failing_tests.nix new file mode 100644 index 000000000000..a1f82a98dc16 --- /dev/null +++ b/pkgs/applications/video/manim/failing_tests.nix @@ -0,0 +1,74 @@ +# reason for failure: tests try to open display +[ + "test_background_color" + "test_scene_add_remove" + "test_Circle" + "test_wait_skip" + "test_basic_scene_with_default_values" + "test_dry_run_with_png_format" + "test_dry_run_with_png_format_skipped_animations" + "test_FixedMobjects3D" + "test_basic_scene_l_flag" + "test_n_flag" + "test_s_flag_opengl_renderer" + "test_s_flag_no_animations" + "test_image_output_for_static_scene" + "test_no_image_output_with_interactive_embed" + "test_no_default_image_output_with_non_static_scene" + "test_image_output_for_static_scene_with_write_to_movie" + "test_s_flag" + "test_r_flag" + "test_play_skip" + "test_write_to_movie_disables_window" + "test_a_flag" + "test_pixel_coords_to_space_coords" + "test_t_values" + "test_custom_folders" + "test_t_values[15]" + "test_t_values[30]" + "test_t_values[60]" + "test_dash_as_filename" + "test_images_are_created_when_png_format_set_for_opengl" + "test_t_values_with_skip_animations" + "test_static_wait_detection" + "test_non_static_wait_detection" + "test_frozen_frame" + "test_gif_format_output" + "test_animate_with_changed_custom_attribute" + "test_images_are_zero_padded_when_zero_pad_set_for_opengl" + "test_mp4_format_output" + "test_videos_not_created_when_png_format_set" + "test_images_are_created_when_png_format_set" + "test_images_are_zero_padded_when_zero_pad_set" + "test_webm_format_output" + "test_default_format_output_for_transparent_flag" + "test_mov_can_be_set_as_output_format" + "test_force_window_opengl_render_with_format" + "test_get_frame_with_preview_disabled" + "test_get_frame_with_preview_enabled" +] ++ + +# reason for failure: tests try to reach network +[ + "test_logging_to_file" + "test_plugin_function_like" + "test_plugin_no_all" + "test_plugin_with_all" +] ++ + +# failing with: +# E AssertionError: +# E Not equal to tolerance rtol=1e-07, atol=1.01 +# E Frame no -1. You can use --show_diff to visually show the difference. +# E Mismatched elements: 18525 / 1639680 (1.13%) +# E Max absolute difference: 255 +# E Max relative difference: 255. +[ + "test_Text2Color" +] ++ + +# failing with: +# TypeError: __init__() got an unexpected keyword argument 'msg' - maybe you meant pytest.mark.skipif? +[ + "test_force_window_opengl_render_with_movies" +] diff --git a/pkgs/applications/video/manim/remove-dependency-constraints.patch b/pkgs/applications/video/manim/remove-dependency-constraints.patch deleted file mode 100644 index 4a7da45d0f57..000000000000 --- a/pkgs/applications/video/manim/remove-dependency-constraints.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git i/requirements.txt w/requirements.txt -index 556122ad..11fd49d5 100644 ---- i/requirements.txt -+++ w/requirements.txt -@@ -1,11 +1,10 @@ --argparse==1.4.0 --colour==0.1.5 --numpy==1.15.0 --Pillow==5.2.0 --progressbar==2.5 --scipy==1.1.0 --tqdm==4.24.0 --opencv-python==3.4.2.17 --pycairo==1.17.1; sys_platform == 'linux' --pycairo>=1.18.0; sys_platform == 'win32' --pydub==0.23.0 -+colour -+numpy -+Pillow -+progressbar -+scipy -+tqdm -+pycairo -+pycairo>=1.18.1; sys_platform == 'win32' -+pydub -+pyreadline==2.1; sys_platform == 'win32' diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index e42ec58d1275..610f408e4419 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }: +{ fetchFromGitHub, lib, stdenv, zlib, qtbase, qt5compat ? null, cmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "quazip"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib qtbase ]; + propagatedBuildInputs = [ qt5compat ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index d111ee8ed0bf..3e2146899913 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.36.2"; + version = "2.36.3"; outputs = [ "out" "dev" ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "/pO920oCwONvkm77boHSiv0oi4gk9sXPanXPQCKOAI4="; + sha256 = "sha256-cy/PjE7GRLjtKLRuu9fB66udngr+qb315dEnhq/EeNE="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a9ddf1554bb2..08892fafa504 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -35,7 +35,6 @@ , "awesome-lint" , "balanceofsatoshis" , "bash-language-server" -, "beancount-langserver" , "bower" , "bower2nix" , "browserify" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 86c8d71c1c80..13ca8b9cc233 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -10291,13 +10291,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.26.0" = { + "@typescript-eslint/eslint-plugin-5.27.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.26.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.26.0.tgz"; - sha512 = "oGCmo0PqnRZZndr+KwvvAUvD3kNE4AfyoGCwOZpoCncSh4MVD06JTE8XQa2u9u+NX5CsyZMBTEc2C72zx38eYA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.0.tgz"; + sha512 = "DDrIA7GXtmHXr1VCcx9HivA39eprYBIFxbQEHI6NyraRDxCGpxAFiYQAT/1Y0vh1C+o2vfBiy4IuPoXxtTZCAQ=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -10318,13 +10318,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.26.0" = { + "@typescript-eslint/parser-5.27.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.26.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.26.0.tgz"; - sha512 = "n/IzU87ttzIdnAH5vQ4BBDnLPly7rC5VnjN3m0xBG82HK6rhRxnCb3w/GyWbNDghPd+NktJqB/wl6+YkzZ5T5Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz"; + sha512 = "8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -10336,22 +10336,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.26.0" = { + "@typescript-eslint/scope-manager-5.27.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.26.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.26.0.tgz"; - sha512 = "gVzTJUESuTwiju/7NiTb4c5oqod8xt5GhMbExKsCTp6adU3mya6AGJ4Pl9xC7x2DX9UYFsjImC0mA62BCY22Iw=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz"; + sha512 = "VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g=="; }; }; - "@typescript-eslint/type-utils-5.26.0" = { + "@typescript-eslint/type-utils-5.27.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.26.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.26.0.tgz"; - sha512 = "7ccbUVWGLmcRDSA1+ADkDBl5fP87EJt0fnijsMFTVHXKGduYMgienC/i3QwoVhDADUAPoytgjbZbCOMj4TY55A=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.27.0.tgz"; + sha512 = "vpTvRRchaf628Hb/Xzfek+85o//zEUotr1SmexKvTfs7czXfYjXVT/a5yDbpzLBX1rhbqxjDdr1Gyo0x1Fc64g=="; }; }; "@typescript-eslint/types-4.33.0" = { @@ -10363,13 +10363,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.26.0" = { + "@typescript-eslint/types-5.27.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.26.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.26.0.tgz"; - sha512 = "8794JZFE1RN4XaExLWLI2oSXsVImNkl79PzTOOWt9h0UHROwJedNOD2IJyfL0NbddFllcktGIO2aOu10avQQyA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz"; + sha512 = "lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A=="; }; }; "@typescript-eslint/typescript-estree-4.33.0" = { @@ -10381,22 +10381,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.26.0" = { + "@typescript-eslint/typescript-estree-5.27.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.26.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.26.0.tgz"; - sha512 = "EyGpw6eQDsfD6jIqmXP3rU5oHScZ51tL/cZgFbFBvWuCwrIptl+oueUZzSmLtxFuSOQ9vDcJIs+279gnJkfd1w=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz"; + sha512 = "QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ=="; }; }; - "@typescript-eslint/utils-5.26.0" = { + "@typescript-eslint/utils-5.27.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.26.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.26.0.tgz"; - sha512 = "PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.27.0.tgz"; + sha512 = "nZvCrkIJppym7cIbP3pOwIkAefXOmfGPnCM0LQfzNaKxJHI6VjI8NC662uoiPlaf5f6ymkTy9C3NQXev2mdXmA=="; }; }; "@typescript-eslint/visitor-keys-4.33.0" = { @@ -10408,13 +10408,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.26.0" = { + "@typescript-eslint/visitor-keys-5.27.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.26.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz"; - sha512 = "wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz"; + sha512 = "46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -12379,15 +12379,6 @@ let sha512 = "JqutcFwoU1+jhv7ArgW38bqrE+LQdcRv4NxNw0mp0JHQyB6tXesWRjtYKlDgHRY2o3JE5UTaBGUK8kSWUdxWUg=="; }; }; - "anchor-markdown-header-0.5.7" = { - name = "anchor-markdown-header"; - packageName = "anchor-markdown-header"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz"; - sha512 = "AmikqcK15r3q99hPvTa1na9n3eLkW0uE+RL9BZMSgwYalQeDnNXbYrN06BIcBPfGlmsGIE2jvkuvl/x0hyPF5Q=="; - }; - }; "ansi-0.3.1" = { name = "ansi"; packageName = "ansi"; @@ -17969,13 +17960,13 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.3.10" = { + "cdk8s-2.3.11" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.3.10"; + version = "2.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.3.10.tgz"; - sha512 = "Qql5YLyIPkDqYYRwjFVukaWRDwKFoTFdiNFZI1f9dL1dW3TMVhLqmgsQwlYrUQSrlz0j9KkpYd4HeAPt6Z7rgA=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.3.11.tgz"; + sha512 = "xwsy5xErTHNvhojNG66t67lFESBJaD0efQFeFZwAAUBXNjPDDpRKADX04ENUfTQLmcNeiXTCX6Cl3Uy58zoE2A=="; }; }; "cdk8s-plus-22-2.0.0-rc.0" = { @@ -20651,13 +20642,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.22" = { + "constructs-10.1.23" = { name = "constructs"; packageName = "constructs"; - version = "10.1.22"; + version = "10.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.22.tgz"; - sha512 = "abxskX/xWj5OBAZp75CF3m8zTh45vqKth+PLzoNSYwXv0nFqCwXdzlvjH2LCegAvISy6bHDn5xtypVlMA4okKw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.23.tgz"; + sha512 = "ZjUn4MI6EiNYHeBjISVlCNTerHbDbuyWv8WW0WJnuvzsSAExBdxi7K5WJx27TgsD1jPZyvZnhJabDxilvBbKag=="; }; }; "consume-http-header-1.0.0" = { @@ -25062,15 +25053,6 @@ let sha512 = "gnEhxITHpOXNXdlwJgJEq3xnJokm0IZOmrmHlJv8zCB2EDsgZWwdYWuktMMslIywK2YT22gxgZEoFjtEaJqzhQ=="; }; }; - "doctoc-2.2.0" = { - name = "doctoc"; - packageName = "doctoc"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctoc/-/doctoc-2.2.0.tgz"; - sha512 = "PtiyaS+S3kcMbpx6x2V0S+PeDKisxmjEFnZsuYkkj4Lh3ObozJuuYh9dM4+sX02Ouuty8RF2LOCnIbpu/hWy/A=="; - }; - }; "doctrine-2.1.0" = { name = "doctrine"; packageName = "doctrine"; @@ -25944,13 +25926,13 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.141" = { + "electron-to-chromium-1.4.142" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.141"; + version = "1.4.142"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.141.tgz"; - sha512 = "mfBcbqc0qc6RlxrsIgLG2wCqkiPAjEezHxGTu7p3dHHFOurH4EjS9rFZndX5axC8264rI1Pcbw8uQP39oZckeA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.142.tgz"; + sha512 = "ea8Q1YX0JRp4GylOmX4gFHIizi0j9GfRW4EkaHnkZp0agRCBB4ZGeCv17IEzIvBkiYVwfoKVhKZJbTfqCRdQdg=="; }; }; "electrum-client-git+https://github.com/janoside/electrum-client" = { @@ -26063,15 +26045,6 @@ let sha512 = "F9uKjyRsj7qjqZh7yjgHYa7XCgJgGI+nHTUqxkq/TDGuq0wLFbUX0wNes3XC6OA2j2Uu8PaeZD6hvCu5eO3lTA=="; }; }; - "emoji-regex-6.1.3" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "6.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.3.tgz"; - sha512 = "73/zxHTjP2N2FQf0J5ngNjxP9LqG2krUshxYaowI8HxZQsiL2pYJc3k9/O93fc5/lCSkZv+bQ5Esk6k6msiSvg=="; - }; - }; "emoji-regex-6.5.1" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -38386,13 +38359,13 @@ let sha512 = "aJgfBwn3srai/4HGwYx5si+W4kuzaQh2/1xCzgpiOKwu/n0UZg0IB7z59IG6HQ/G5Yfu8Mc6AEfjAsi0kj2dbA=="; }; }; - "jsii-srcmak-0.1.575" = { + "jsii-srcmak-0.1.576" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.575"; + version = "0.1.576"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.575.tgz"; - sha512 = "QI3amduv7+Q8sn4Nm3R/AjEyevbSuUeNDkUcGTgUAQJlNdKbBVc4qR6muo8itwVbNtxKMr0dVS+Q5tEWHdvtqw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.576.tgz"; + sha512 = "+yIhXJJfb66plT3vie8n0YV7NLOQElKfZc5hzao3fhfdsuBwBi26KQd69VNYr3r5Q5TkESQw6vabAaQOXSjdPw=="; }; }; "json-bigint-1.0.0" = { @@ -38683,13 +38656,13 @@ let sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA=="; }; }; - "json2jsii-0.3.25" = { + "json2jsii-0.3.26" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.25"; + version = "0.3.26"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.25.tgz"; - sha512 = "HA/UIuePgbuVOff5jxdE5HHxm9dPG839gy7fjkOcuSKcljY1qtjbNdx/im2/gEFPF94WxraUvfvBcby+0+/sIw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.26.tgz"; + sha512 = "KN6vuAj1XFZ3gTXSW5O/i8giwEXPs7QqK7WotClahs3wkndPAr8Dh1VdutyafvXCF3N5blN+GUdSBRtBAkcTWQ=="; }; }; "json3-3.2.6" = { @@ -42704,7 +42677,7 @@ let version = "0.0.5"; src = fetchurl { url = "https://registry.npmjs.org/magicli/-/magicli-0.0.5.tgz"; - sha1 = "cee7d0fbb4c70518aacb11ec3eb7e25ff49a4921"; + sha512 = "wZbMtnl2v1b+Jp3xlqA9FU/O4I6YhGXR8xSY/eU2+gDAvut/F+W3gl4qs61iL4LELC7jqSAE6aAD5668EbmQHA=="; }; }; "magicli-0.0.8" = { @@ -42722,7 +42695,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; - sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209"; + sha512 = "PmoK9UeaVTXHNYGAJab/HmTYBvz3QuvMQKiEVu6mAuLsOcV/TUJuiyffKh+ayn0zLnU3ViLModW6jbxUUUWSZg=="; }; }; "magnet-uri-4.2.3" = { @@ -42731,7 +42704,7 @@ let version = "4.2.3"; src = fetchurl { url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz"; - sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8"; + sha512 = "aHhR49CRBOq3BX6jQOBdGMXhNT2+9LIH3CCIwHlR+aFE8nWMfBD1aNYxfm2u2LsCOwvfPeyCsdIg9KXSwdsOLQ=="; }; }; "magnet-uri-5.4.0" = { @@ -42839,7 +42812,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + sha512 = "8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg=="; }; }; "map-canvas-0.1.5" = { @@ -42848,7 +42821,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/map-canvas/-/map-canvas-0.1.5.tgz"; - sha1 = "8be6bade0bf3e9f9a8b56e8836a1d1d133cab186"; + sha512 = "f7M3sOuL9+up0NCOZbb1rQpWDLZwR/ftCiNbyscjl9LUUEwrRaoumH4sz6swgs58lF21DQ0hsYOCw5C6Zz7hbg=="; }; }; "map-filter-reduce-2.2.1" = { @@ -42857,7 +42830,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-2.2.1.tgz"; - sha1 = "632b127c3ae5d6ad9e21cfdd9691b63b8944fcd2"; + sha512 = "A/pDveT5HWrJk8II4gH6QhuDIYs+FC7X8eAmACyNJsWpIF35/wSWIHi6h+9EDUj3u46qfjBmfL4TW/70m0I8ZQ=="; }; }; "map-filter-reduce-3.2.2" = { @@ -42875,7 +42848,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz"; - sha1 = "6a6fc58c95d8aab46c2bdde44d515b6ee06fce34"; + sha512 = "TGNNg3WqoLsS5HnlK6GHIXFvM/0wYMtlyflc1nAQUhgptr9wIu7JwQ2YsqnpFSqbSYFv2U6rgXQTHJmWJOtlzQ=="; }; }; "map-obj-1.0.1" = { @@ -42884,7 +42857,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + sha512 = "7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="; }; }; "map-obj-2.0.0" = { @@ -42893,7 +42866,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz"; - sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; + sha512 = "TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ=="; }; }; "map-obj-4.3.0" = { @@ -42911,7 +42884,7 @@ let version = "0.0.7"; src = fetchurl { url = "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz"; - sha1 = "8a1f07896d82b10926bd3744a2420009f88974a8"; + sha512 = "C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ=="; }; }; "map-stream-0.1.0" = { @@ -42920,7 +42893,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + sha512 = "CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g=="; }; }; "map-visit-1.0.0" = { @@ -42929,7 +42902,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; - sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + sha512 = "4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w=="; }; }; "mapbox-gl-1.13.2" = { @@ -42947,7 +42920,7 @@ let version = "8.11.1"; src = fetchurl { url = "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz"; - sha1 = "180f1f9ebef8b0e638e4166ad52db879beb2ffc5"; + sha512 = "1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ=="; }; }; "markdown-escapes-1.0.4" = { @@ -42992,7 +42965,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/markdown-it-abbr/-/markdown-it-abbr-1.0.4.tgz"; - sha1 = "d66b5364521cbb3dd8aa59dadfba2fb6865c8fd8"; + sha512 = "ZeA4Z4SaBbYysZap5iZcxKmlPL6bYA8grqhzJIHB1ikn7njnzaP8uwbtuXc4YXD5LicI4/2Xmc0VwmSiFV04gg=="; }; }; "markdown-it-anchor-5.3.0" = { @@ -43028,7 +43001,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz"; - sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"; + sha512 = "QCz3Hkd+r5gDYtS2xsFXmBYrgw6KuWcJZLCEkdfAuwzZbShCmCfta+hwAMq4NX/4xPzkSHduMKgMkkPUJxSXNg=="; }; }; "markdown-it-expand-tabs-1.0.13" = { @@ -43091,7 +43064,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz"; - sha1 = "375fd6026eae7ddcb012497f6411195ea1e3afe8"; + sha512 = "z2Rm/LzEE1wzwTSDrI+FlPEveAAbgdAdPhdWarq/ZGJrGW/uCQbKAnhoCsE4hAbc3SEym26+W2z/VQB0cQiA9Q=="; }; }; "markdown-it-sup-1.0.0" = { @@ -43100,7 +43073,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz"; - sha1 = "cb9c9ff91a5255ac08f3fd3d63286e15df0a1fc3"; + sha512 = "E32m0nV9iyhRR7CrhnzL5msqic7rL1juWre6TQNxsnApg7Uf+F97JOKxUijg5YwXz86lZ0mqfOnutoryyNdntQ=="; }; }; "markdown-it-task-checkbox-1.0.6" = { @@ -43136,7 +43109,7 @@ let version = "0.3.3"; src = fetchurl { url = "https://registry.npmjs.org/markdown-serve/-/markdown-serve-0.3.3.tgz"; - sha1 = "02328f5b2c60fe0767cd73ab9048861f33196c1b"; + sha512 = "9zW+W1nUQGiJoumfqrHPQp9Yi/EZNiKscNPuf8Ezk34cF7ivIV30ri+2fyv3a61zyfVIB3kqad0lvWbmwx9SWw=="; }; }; "markdown-table-0.4.0" = { @@ -43145,7 +43118,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz"; - sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; + sha512 = "9i/E3ZtVAoaDulRQjoPseX2X5pBNdeR8MInQb57JFvCAq4glz/w2q31eL0NHMKOntzy2D6X3plZDH4+OGuz5Fw=="; }; }; "markdown-table-2.0.0" = { @@ -43235,7 +43208,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/mastodon-api/-/mastodon-api-1.3.0.tgz"; - sha1 = "b3bcffcf51e005f754b7e86e44c2023d8e2c63d1"; + sha512 = "h1S0f3HzPtaNTaIBXu/3PVsXhKgZGk9DYrqp+bNZwp1wjYhJnEKggossj+DCCQ72+2y3Kcd7fNP2cEkp9jK6Ig=="; }; }; "match-casing-1.0.3" = { @@ -43271,7 +43244,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz"; - sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"; + sha512 = "LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA=="; }; }; "matcher-3.0.0" = { @@ -43325,7 +43298,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"; - sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; + sha512 = "PlGG4z5mBANDGCKsYQe0CaUYHdZYZt8ZPZLmEt+Urf0W4GlpTX4HescwHU+dc9+Z/G/vZKYZYFrwgm9VxK6QOQ=="; }; }; "md5-2.3.0" = { @@ -43370,7 +43343,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/md5hex/-/md5hex-1.0.0.tgz"; - sha1 = "ed74b477a2ee9369f75efee2f08d5915e52a42e8"; + sha512 = "c2YOUbp33+6thdCUi34xIyOU/a7bvGKj/3DB1iaPMTuPHf/Q2d5s4sn1FaCOO43XkXggnb08y5W2PU8UNYNLKQ=="; }; }; "mdast-comment-marker-1.1.2" = { @@ -43676,7 +43649,7 @@ let version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/mdmanifest/-/mdmanifest-1.0.8.tgz"; - sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; + sha512 = "x7QEK3/RbANozWnUhmSPzT01yL/PsO2zBDWzDRr+tMRs0o/HQxbDzGb34JiQ2bGnSf88eKuMgrAzMR1+hyRBLw=="; }; }; "mdn-data-2.0.14" = { @@ -43703,7 +43676,7 @@ let version = "0.5.0"; src = fetchurl { url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz"; - sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87"; + sha512 = "9I7T9NDWYrnAbaV2OsEzR+RVa/WpQjRZKhpm95Fnd5T7HdTKzmGVSEI4pqdbvkfHiB2CB4eagr5dcCY8idZLag=="; }; }; "mdns-js-1.0.3" = { @@ -43721,7 +43694,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz"; - sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616"; + sha512 = "+0FV+YXgmt4cxAHY1HtmZFVzVbhWAIuABtxhHuZ9uQGIg3opmK2kg5V62DGntWyfgqA9ZywaTPi4w8ummYDdHA=="; }; }; "mdurl-1.0.1" = { @@ -43730,7 +43703,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; - sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; + sha512 = "/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="; }; }; "meant-1.0.3" = { @@ -43748,7 +43721,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; }; "media-typer-1.1.0" = { @@ -43784,7 +43757,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; - sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + sha512 = "5+dxzEs7G/UbhQWiUokjHuWoCDyNVYHQLblOsKCps6NZFZaOMauMRlXxpmunDQoBkHMuf7pQ1M1CPVdTOkzFCw=="; }; }; "mem-4.3.0" = { @@ -43856,7 +43829,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/memoizeasync/-/memoizeasync-1.1.0.tgz"; - sha1 = "9d7028a6f266deb733510bb7dbba5f51878c561e"; + sha512 = "HMfzdLqClZo8HMyuM9B6TqnXCNhw82iVWRLqd2cAdXi063v2iJB4mQfWFeKVByN8VUwhmDZ8NMhryBwKrPRf8Q=="; }; }; "memoizee-0.4.15" = { @@ -43874,7 +43847,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/memory-cache/-/memory-cache-0.2.0.tgz"; - sha1 = "7890b01d52c00c8ebc9d533e1f8eb17e3034871a"; + sha512 = "OcjA+jzjOYzKmKS6IQVALHLVz+rNTMPoJvCztFaZxwG14wtAW7VRZjwTQu06vKCYOxh4jVnik7ya0SXTB0W+xA=="; }; }; "memory-chunk-store-1.3.5" = { @@ -43892,7 +43865,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; - sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; + sha512 = "QTNXnl79X97kZ9jJk/meJrtDuvgvRakX5LU7HZW1L7MsXHuSTwoMIzN9tOLLH3Xfsj/gbsSqX/ovnsqz246zKQ=="; }; }; "memory-fs-0.4.1" = { @@ -43901,7 +43874,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; - sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + sha512 = "cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ=="; }; }; "memory-fs-0.5.0" = { @@ -43946,7 +43919,7 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz"; - sha1 = "86d7090b30ce455d63fbae12dda51a47ddcaf9b2"; + sha512 = "S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw=="; }; }; "meow-10.1.2" = { @@ -43964,7 +43937,7 @@ let version = "3.7.0"; src = fetchurl { url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; - sha1 = "72cb668b425228290abbfa856892587308a801fb"; + sha512 = "TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA=="; }; }; "meow-5.0.0" = { @@ -44009,7 +43982,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; }; }; "merge-options-3.0.4" = { @@ -44027,7 +44000,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz"; - sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f"; + sha512 = "PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA=="; }; }; "merge-source-map-1.1.0" = { @@ -44063,7 +44036,7 @@ let version = "2.0.10"; src = fetchurl { url = "https://registry.npmjs.org/merkle-lib/-/merkle-lib-2.0.10.tgz"; - sha1 = "82b8dbae75e27a7785388b73f9d7725d0f6f3326"; + sha512 = "XrNQvUbn1DL5hKNe46Ccs+Tu3/PYOlrcZILuGUhb95oKBPjc/nmIC8D462PQkipVDGKRvwhn+QFg2cCdIvmDJA=="; }; }; "merkle-tree-stream-3.0.3" = { @@ -44072,7 +44045,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/merkle-tree-stream/-/merkle-tree-stream-3.0.3.tgz"; - sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; + sha512 = "cylD/HcPXjeSVEPj4menLP0mndi6gvqmTlDq3QF4Vptn1tgc6ilgK7rdcAUA4X3RTkymXRwLuZpNncIfq1q1AA=="; }; }; "merkle-tree-stream-4.0.0" = { @@ -44144,7 +44117,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/method-missing/-/method-missing-1.2.4.tgz"; - sha1 = "1fbf19c136e78b4b2c4e1f5541915fb0d589abe7"; + sha512 = "tmj4CKZJVQd/ZuN9hnYD8HBAs/3RdDdqUeJG9RbVYlEZLuPYK4EW+EekMqLsCV4w1HastX+Pk2Ov87OQmeo01A=="; }; }; "method-override-2.3.10" = { @@ -44153,7 +44126,7 @@ let version = "2.3.10"; src = fetchurl { url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz"; - sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"; + sha512 = "Ks2/7e+3JuwQcpLybc6wTHyqg13HDjOhLcE+YaAEub9DbSxF+ieMvxUlybmWW9luRMh9Cd0rO9aNtzUT51xfNQ=="; }; }; "method-override-3.0.0" = { @@ -44171,7 +44144,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; - sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; + sha512 = "pB8oFfci/xcfUgM6DTxc7lbTKifPPgs3mZUOsEgaH+1TTWpmcmv3sHl+5sUHIj2X2W8aPYa2+nJealRHK+Lo6A=="; }; }; "methods-0.1.0" = { @@ -44180,7 +44153,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; - sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; + sha512 = "N4cn4CbDqu7Fp3AT4z3AsO19calgczhsmCGzXLCiUOrWg9sjb1B+yKFKOrnnPGKKvjyJBmw+k6b3adFN2LbuBw=="; }; }; "methods-1.1.2" = { @@ -44189,7 +44162,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; }; }; "microee-0.0.6" = { @@ -44198,7 +44171,7 @@ let version = "0.0.6"; src = fetchurl { url = "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz"; - sha1 = "a12bdb0103681e8b126a9b071eba4c467c78fffe"; + sha512 = "/LdL3jiBWDJ3oQIRLgRhfeCZNE3patM1LiwCC124+/HHn10sI/G2OAyiMfTNzH5oYWoZBk0tRZADAUOv+0Wt0A=="; }; }; "microevent.ts-0.1.1" = { @@ -44621,7 +44594,7 @@ let version = "2.3.11"; src = fetchurl { url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; - sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + sha512 = "LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA=="; }; }; "micromatch-3.1.10" = { @@ -44666,7 +44639,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/middleware-handler/-/middleware-handler-0.2.0.tgz"; - sha1 = "bf02af7e6b577c0230609b2ae58df0e446f3fd02"; + sha512 = "Qz4B0yWndSokapr3Kl7fpMRysS0DaBlOuATrExFuZbr+oXZ3rsAPufdLe8mUJXiG5A4aJGW6GfKS4PDfQwu7Mg=="; }; }; "miller-rabin-4.0.1" = { @@ -44684,7 +44657,7 @@ let version = "1.2.11"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + sha512 = "Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw=="; }; }; "mime-1.2.4" = { @@ -44693,7 +44666,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; - sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + sha512 = "u4y8WFj7SnfbHxyzCMSV2nL/GKbfZ+lidPf1V4/XUKCJ49N6ttQWp/xnqpbMQEx3naBSt93i2qtPLFj/mjPDaA=="; }; }; "mime-1.2.6" = { @@ -44702,7 +44675,7 @@ let version = "1.2.6"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz"; - sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; + sha512 = "S4yfg1ehMduQ5F3NeTUUWJesnut4RvymaRSatO4etOm68yZE98oCg2GtgG0coGYx03GCv240sezMvRwFk8DUKw=="; }; }; "mime-1.3.4" = { @@ -44711,7 +44684,7 @@ let version = "1.3.4"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + sha512 = "sAaYXszED5ALBt665F0wMQCUXpGuZsGdopoqcHPdL39ZYdi7uHoZlhrfZfhv8WzivhBzr/oXwaj+yiK5wY8MXQ=="; }; }; "mime-1.4.1" = { @@ -44927,7 +44900,7 @@ let version = "2.19.0"; src = fetchurl { url = "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz"; - sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; + sha512 = "9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ=="; }; }; "min-indent-1.0.1" = { @@ -44981,7 +44954,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/minilog/-/minilog-3.1.0.tgz"; - sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675"; + sha512 = "Xfm4jWjWzSAduvEWtuZX/8TMkxfJlCfH7XvikCZe3ptojYTBq1eoEs3rh9/3LNLOckUP86m+8l8+Iw5NU/pBww=="; }; }; "minimalistic-assert-1.0.1" = { @@ -44999,7 +44972,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + sha512 = "JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="; }; }; "minimatch-0.3.0" = { @@ -45008,7 +44981,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; - sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; + sha512 = "WFX1jI1AaxNTZVOHLBVazwTWKaQjoykSzCBNXB72vDTCzopQGtyP91tKdFK5cv1+qMwPyiTu1HqUriqplI8pcA=="; }; }; "minimatch-3.0.4" = { @@ -45071,7 +45044,7 @@ let version = "0.0.10"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + sha512 = "iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw=="; }; }; "minimist-0.0.8" = { @@ -45080,7 +45053,7 @@ let version = "0.0.8"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + sha512 = "miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q=="; }; }; "minimist-1.2.3" = { @@ -45260,7 +45233,7 @@ let version = "0.0.0"; src = fetchurl { url = "https://registry.npmjs.org/mired/-/mired-0.0.0.tgz"; - sha1 = "f98ee7b5fffd3f4dadc5733827db0aa57f861880"; + sha512 = "uYi3iDaFHOmOwqFT3KEZsr2iPBboFf9k0teiUJVfS4Bgkpk02bOR6YqL8AlO0A1s8CPzPyz4zpLAZB2nQ2k4ww=="; }; }; "mirror-folder-3.1.0" = { @@ -45287,7 +45260,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/misspellings/-/misspellings-1.1.0.tgz"; - sha1 = "53d500266cbd09cda9d94c4cf392e60589b5b324"; + sha512 = "4QT2u/8X7PccbiHUcsZeEZrt3jGIVEpfcQ1RU01wDHKHVNtNhaP+0Xmsg7YPxD7OCc8bO802BTEWeGPvAXBwuw=="; }; }; "mitt-1.2.0" = { @@ -45323,7 +45296,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + sha512 = "OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew=="; }; }; "mkdirp-0.3.5" = { @@ -45332,7 +45305,7 @@ let version = "0.3.5"; src = fetchurl { url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + sha512 = "8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg=="; }; }; "mkdirp-0.5.1" = { @@ -45341,7 +45314,7 @@ let version = "0.5.1"; src = fetchurl { url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + sha512 = "SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA=="; }; }; "mkdirp-0.5.6" = { @@ -45413,7 +45386,7 @@ let version = "2.5.3"; src = fetchurl { url = "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz"; - sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; + sha512 = "jNt2iEk9FPmZLzL+sm4FNyOIDYXf2wUU6L4Cc8OIKK/kzgMHKPi4YhTZqG4bW4kQVdIv6wutDybRhXfdnujA1Q=="; }; }; "mocha-8.4.0" = { @@ -45467,7 +45440,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz"; - sha1 = "114c949673e2a8a35e9d35788527aa37b679da2b"; + sha512 = "ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A=="; }; }; "mold-source-map-0.4.0" = { @@ -45476,7 +45449,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz"; - sha1 = "cf67e0b31c47ab9badb5c9c25651862127bb8317"; + sha512 = "Y0uA/sDKVuPgLd7BmaJOai+fqzjrOlR6vZgx5cJIvturI/xOPQPgbf3X7ZbzJd6MvqQ6ucIfK8dSteFyc2Mw2w=="; }; }; "moment-2.29.1" = { @@ -45503,7 +45476,7 @@ let version = "2.7.0"; src = fetchurl { url = "https://registry.npmjs.org/moment/-/moment-2.7.0.tgz"; - sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; + sha512 = "zp8slBaeHVn8VOr7aTVzXYYayoVtEF3XI9gmgimyR3PBZsBk4JlXlFgxmcKxRjBZ1voh9ao77u/qwMGSZVZ9+A=="; }; }; "moment-duration-format-2.3.2" = { @@ -45557,7 +45530,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/moniker/-/moniker-0.1.2.tgz"; - sha1 = "872dfba575dcea8fa04a5135b13d5f24beccc97e"; + sha512 = "Uj9iV0QYr6281G+o0TvqhKwHHWB2Q/qUTT4LPQ3qDGc0r8cbMuqQjRXPZuVZ+gcL7APx+iQgE8lcfWPrj1LsLA=="; }; }; "monotonic-timestamp-0.0.9" = { @@ -45566,7 +45539,7 @@ let version = "0.0.9"; src = fetchurl { url = "https://registry.npmjs.org/monotonic-timestamp/-/monotonic-timestamp-0.0.9.tgz"; - sha1 = "5ba5adc7aac85e1d7ce77be847161ed246b39603"; + sha512 = "PQcys7iTcXiMyW8cgK5B/fhKGteB/WLqWN1f+s7IJHyyRd80JnJYoNo03kTQcGZhVtsKz5kEWiS7W94gfY6qcQ=="; }; }; "moo-0.5.1" = { @@ -45620,7 +45593,7 @@ let version = "0.5.0"; src = fetchurl { url = "https://registry.npmjs.org/mout/-/mout-0.5.0.tgz"; - sha1 = "ff967566a90f29595e9cb8b6e7800a5b56635583"; + sha512 = "EMyGu92QKMvG69pHqh9guoDIDsh4lpR+Lmb51ZS6bHLr/NL6fXpYKwbsRp7LeLFvw9f0dxxQAJCh0Ts8mMM/Fw=="; }; }; "move-concurrently-1.0.1" = { @@ -53068,15 +53041,6 @@ let sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg=="; }; }; - "prebuild-install-5.3.6" = { - name = "prebuild-install"; - packageName = "prebuild-install"; - version = "5.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz"; - sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; - }; - }; "prebuild-install-6.1.4" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -66363,24 +66327,6 @@ let sha512 = "Of3tPmVs3b6BhzyUJ7t0olisf47kYr9qAm0XaUpURMjdBn6TwiVaaMuTFoKkkvPGojd9trKAHlrGGcGKcdR1DA=="; }; }; - "tree-sitter-0.17.2" = { - name = "tree-sitter"; - packageName = "tree-sitter"; - version = "0.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.17.2.tgz"; - sha512 = "bxFEolb9xMxBdbwh4wqT730J8fu10J15EL8lM+iGr8LcKbhuQ7KHA0pPsmNPIpZlr6vyDKFojJnD45JtIBIV0w=="; - }; - }; - "tree-sitter-beancount-1.0.0" = { - name = "tree-sitter-beancount"; - packageName = "tree-sitter-beancount"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tree-sitter-beancount/-/tree-sitter-beancount-1.0.0.tgz"; - sha512 = "I+QbnbfSA7+ePEhIHRwq+X2ZrTQS5VoZ47kPTsn5FEiAGGo87mhLK4O3vCaFUHQ8Ibm8eXESEKf1dl0QmA9CHQ=="; - }; - }; "treeify-1.1.0" = { name = "treeify"; packageName = "treeify"; @@ -66813,15 +66759,6 @@ let sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; }; }; - "tsyringe-4.7.0" = { - name = "tsyringe"; - packageName = "tsyringe"; - version = "4.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.7.0.tgz"; - sha512 = "ncFDM1jTLsok4ejMvSW5jN1VGPQD48y2tfAR0pdptWRKYX4bkbqPt92k7KJ5RFJ1KV36JEs/+TMh7I6OUgj74g=="; - }; - }; "ttl-1.3.1" = { name = "ttl"; packageName = "ttl"; @@ -68766,15 +68703,6 @@ let sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; }; }; - "update-section-0.3.3" = { - name = "update-section"; - packageName = "update-section"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz"; - sha1 = "458f17820d37820dc60e20b86d94391b00123158"; - }; - }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -71448,15 +71376,6 @@ let sha512 = "3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ=="; }; }; - "web-tree-sitter-0.17.1" = { - name = "web-tree-sitter"; - packageName = "web-tree-sitter"; - version = "0.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.17.1.tgz"; - sha512 = "QgaeV+wmlB1Qaw9rS5a0ZDBt8GRcKkF+hGNSVxQ/HLm1lPCow3BKOhoILaXkYm7YozCcL7TjppRADBwFJugbuA=="; - }; - }; "web-tree-sitter-0.20.5" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; @@ -76979,7 +76898,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.9.3" @@ -77340,10 +77259,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "3.5.2"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.5.2.tgz"; - sha512 = "jvDzOlYvujIzUp4xgB9bJ80eGna9d59eIuLgJY1AlZTerNSwnsd6cfEhVofL1peQ6lGKoBzgqhfYzXts5mdinQ=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.6.0.tgz"; + sha512 = "7mb/ZoUUw10swgmHx2j2Lk1hZrrL5wm22uHBmCCkVMkEghjELRQYa8VDPCXE7ipmBrXBnDbkoVHxTEgZg6SXeg=="; }; dependencies = [ sources."@purest/config-1.0.1" @@ -78092,7 +78011,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -79552,7 +79471,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -79939,7 +79858,7 @@ in dependencies = [ sources."browserslist-4.20.3" sources."caniuse-lite-1.0.30001344" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."node-releases-2.0.5" @@ -81413,178 +81332,6 @@ in bypassCache = true; reconstructLock = true; }; - beancount-langserver = nodeEnv.buildNodePackage { - name = "beancount-langserver"; - packageName = "beancount-langserver"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/beancount-langserver/-/beancount-langserver-1.0.0.tgz"; - sha512 = "cwi9b6H7pMWDFcUNsAt2DDStOmd9DCgWUQ5olAe+PHe+dwxqeRJVaCQLMiDwJBOHEPuRhaXh8V/7JEtgQPgoPQ=="; - }; - dependencies = [ - sources."@textlint/ast-node-types-12.1.1" - sources."@textlint/markdown-to-ast-12.1.1" - sources."@types/mdast-3.0.10" - sources."@types/unist-2.0.6" - sources."anchor-markdown-header-0.5.7" - sources."ansi-regex-2.1.1" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" - sources."bail-1.0.5" - sources."base64-js-1.5.1" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."buffer-5.7.1" - sources."ccount-1.1.0" - sources."character-entities-1.2.4" - sources."character-entities-legacy-1.1.4" - sources."character-reference-invalid-1.1.4" - sources."chownr-1.1.4" - sources."code-point-at-1.1.0" - sources."commander-6.2.1" - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.3" - sources."debug-4.3.4" - sources."decompress-response-4.2.1" - sources."deep-extend-0.6.0" - sources."delegates-1.0.0" - sources."detect-libc-1.0.3" - sources."doctoc-2.2.0" - (sources."dom-serializer-1.4.1" // { - dependencies = [ - sources."entities-2.2.0" - ]; - }) - sources."domelementtype-2.3.0" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" - sources."emoji-regex-6.1.3" - sources."end-of-stream-1.4.4" - sources."entities-3.0.1" - sources."escape-string-regexp-4.0.0" - sources."expand-template-2.0.3" - sources."extend-3.0.2" - sources."fault-1.0.4" - sources."format-0.2.2" - sources."fs-constants-1.0.0" - sources."gauge-2.7.4" - sources."github-from-package-0.0.0" - sources."has-unicode-2.0.1" - sources."htmlparser2-7.2.0" - sources."ieee754-1.2.1" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-alphabetical-1.0.4" - sources."is-alphanumerical-1.0.4" - sources."is-buffer-2.0.5" - sources."is-decimal-1.0.4" - sources."is-fullwidth-code-point-1.0.0" - sources."is-hexadecimal-1.0.4" - sources."is-plain-obj-2.1.0" - sources."isarray-1.0.0" - sources."longest-streak-2.0.4" - sources."markdown-table-2.0.0" - sources."mdast-util-find-and-replace-1.1.1" - sources."mdast-util-footnote-0.1.7" - sources."mdast-util-from-markdown-0.8.5" - sources."mdast-util-frontmatter-0.2.0" - sources."mdast-util-gfm-0.1.2" - sources."mdast-util-gfm-autolink-literal-0.1.3" - sources."mdast-util-gfm-strikethrough-0.2.3" - sources."mdast-util-gfm-table-0.1.6" - sources."mdast-util-gfm-task-list-item-0.1.6" - sources."mdast-util-to-markdown-0.6.5" - sources."mdast-util-to-string-2.0.0" - sources."micromark-2.11.4" - sources."micromark-extension-footnote-0.3.2" - sources."micromark-extension-frontmatter-0.2.2" - sources."micromark-extension-gfm-0.3.3" - sources."micromark-extension-gfm-autolink-literal-0.5.7" - sources."micromark-extension-gfm-strikethrough-0.6.5" - sources."micromark-extension-gfm-table-0.4.3" - sources."micromark-extension-gfm-tagfilter-0.3.0" - sources."micromark-extension-gfm-task-list-item-0.3.3" - sources."mimic-response-2.1.0" - sources."minimist-1.2.6" - sources."mkdirp-classic-0.5.3" - sources."ms-2.1.2" - sources."nan-2.16.0" - sources."napi-build-utils-1.0.2" - sources."node-abi-2.30.1" - sources."noop-logger-0.1.1" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."parse-entities-2.0.0" - sources."prebuild-install-5.3.6" - sources."process-nextick-args-2.0.1" - sources."pump-3.0.0" - sources."rc-1.2.8" - sources."readable-stream-2.3.7" - sources."reflect-metadata-0.1.13" - sources."remark-footnotes-3.0.0" - sources."remark-frontmatter-3.0.0" - sources."remark-gfm-1.0.0" - sources."remark-parse-9.0.0" - sources."repeat-string-1.6.1" - sources."safe-buffer-5.1.2" - sources."semver-5.7.1" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-3.1.1" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-json-comments-2.0.1" - sources."tar-fs-2.1.1" - (sources."tar-stream-2.2.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."traverse-0.6.6" - sources."tree-sitter-0.17.2" - sources."tree-sitter-beancount-1.0.0" - sources."trough-1.0.5" - sources."tslib-1.14.1" - sources."tsyringe-4.7.0" - sources."tunnel-agent-0.6.0" - sources."underscore-1.13.3" - sources."unified-9.2.2" - sources."unist-util-is-4.1.0" - sources."unist-util-stringify-position-2.0.3" - sources."unist-util-visit-parents-3.1.1" - sources."update-section-0.3.3" - sources."util-deprecate-1.0.2" - sources."vfile-4.2.1" - sources."vfile-message-2.0.4" - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-7.0.0" - sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.4" - sources."vscode-languageserver-types-3.16.0" - sources."vscode-uri-2.1.2" - sources."web-tree-sitter-0.17.1" - sources."which-pm-runs-1.1.0" - sources."wide-align-1.1.5" - sources."wrappy-1.0.2" - sources."zwitch-1.0.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A Language Server Protocol (LSP) for beancount files"; - homepage = "https://github.com/bryall/beancount-language-server#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; @@ -83709,7 +83456,7 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.3.10" + sources."cdk8s-2.3.11" sources."cdk8s-plus-22-2.0.0-rc.0" sources."chalk-4.1.2" sources."cliui-7.0.4" @@ -83723,7 +83470,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.22" + sources."constructs-10.1.23" sources."date-format-4.0.10" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -83813,14 +83560,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.575" // { + (sources."jsii-srcmak-0.1.576" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.25" + sources."json2jsii-0.3.26" sources."jsonfile-6.1.0" sources."jsonschema-1.4.1" sources."locate-path-5.0.0" @@ -83997,7 +83744,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.22" + sources."constructs-10.1.23" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" sources."date-format-4.0.10" @@ -84145,7 +83892,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.575" // { + (sources."jsii-srcmak-0.1.576" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -85420,7 +85167,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -88842,7 +88589,7 @@ in sources."@types/node-16.11.36" ]; }) - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -90285,7 +90032,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -92739,7 +92486,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -94916,7 +94663,7 @@ in sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96508,7 +96255,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -99147,7 +98894,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -107260,7 +107007,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -110823,7 +110570,7 @@ in version = "0.3.4"; src = fetchurl { url = "https://registry.npmjs.org/meat/-/meat-0.3.4.tgz"; - sha1 = "e2b6b721014096e30de9c97114e1dd6696135d13"; + sha512 = "qaXHW5HwzV9+J4PgnqQ52i9C6V1fhiwQ4skSn+UCQdyPB4H1XYF+0UKIq1kFHINMFhDZ8Lz0WsQjOV09fiImpQ=="; }; dependencies = [ sources."async-0.1.22" @@ -114431,7 +114178,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -115221,7 +114968,7 @@ in sources."domutils-2.8.0" sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -118589,7 +118336,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -120812,14 +120559,14 @@ in sources."@types/json-schema-7.0.11" sources."@types/node-14.17.34" sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.26.0" - sources."@typescript-eslint/parser-5.26.0" - sources."@typescript-eslint/scope-manager-5.26.0" - sources."@typescript-eslint/type-utils-5.26.0" - sources."@typescript-eslint/types-5.26.0" - sources."@typescript-eslint/typescript-estree-5.26.0" - sources."@typescript-eslint/utils-5.26.0" - sources."@typescript-eslint/visitor-keys-5.26.0" + sources."@typescript-eslint/eslint-plugin-5.27.0" + sources."@typescript-eslint/parser-5.27.0" + sources."@typescript-eslint/scope-manager-5.27.0" + sources."@typescript-eslint/type-utils-5.27.0" + sources."@typescript-eslint/types-5.27.0" + sources."@typescript-eslint/typescript-estree-5.27.0" + sources."@typescript-eslint/utils-5.27.0" + sources."@typescript-eslint/visitor-keys-5.27.0" sources."@vscode/test-electron-2.1.3" sources."acorn-8.7.1" sources."acorn-jsx-5.3.2" @@ -122629,10 +122376,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.941.0"; + version = "1.942.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.941.0.tgz"; - sha512 = "K4aLDhsgOW4jkLoKl19wHWnYxlUrPyrLvegeQiuh6Cde4yfJ/7wL6/grUUsBFSe/kqQeR9nEvfQ258AujPHFSg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.942.0.tgz"; + sha512 = "ooZf0+Ms1K1WP4mvRntSiAj35yyNdym36rxoCZjU8NYzV6eeKwO1TqyVfPColjvXh+5Fp4NnWpQ1aFcJY8/ACg=="; }; buildInputs = globalBuildInputs; meta = { @@ -131888,7 +131635,7 @@ in sources."domelementtype-2.3.0" sources."domhandler-5.0.3" sources."domutils-3.0.1" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.9.3" @@ -134182,7 +133929,7 @@ in sources."caniuse-lite-1.0.30001344" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.142" sources."enhanced-resolve-5.9.3" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 921c844e27d8..a976c3de1b02 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -2,17 +2,20 @@ , buildPythonPackage , fetchPypi , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.22.1"; + version = "3.23.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-fOBs0aPekIvpwbrYxzh1wz7EKGko0Je1f/N5H0DIguw="; + hash = "sha256-4OWDwvdQBtV+ZqpITr027z0jwfge5/yOof9Xm7QRtuM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index bbf8d555b5ef..c9cbd16fc0a6 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.8.1"; + version = "3.8.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BaSpw7TiBymCvoP0/z1zynWKQJH/PjbbGf85ZI9LOZw="; + sha256 = "0mplyla4zcai3qld7is7bl5wn2kzhp87w87yi13wpqnw06i6ij4b"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch b/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch index 25e399e78d9b..8198751a1606 100644 --- a/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch +++ b/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch @@ -1,4 +1,4 @@ -commit 105daa26f09034af58eb13ac7c5c4ff5420c1724 +commit 1ccbf21a67da0fdbaad881a1f5c2a4df915e8c57 Author: sternenseemann Date: Tue Oct 5 18:16:10 2021 +0200 @@ -9,19 +9,17 @@ Date: Tue Oct 5 18:16:10 2021 +0200 called antlr4-runtime, not antlr4_static). diff --git a/CMakeLists.txt b/CMakeLists.txt -index d7f86fb6..c43c4456 100644 +index e9c8c08e..dc3a46da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -36,13 +36,13 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - # https://www.antlr.org/download/antlr4-cpp-runtime-4.9.2-source.zip +@@ -36,11 +36,11 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + # https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip # set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip") -add_definitions(-DANTLR4CPP_STATIC) set(ANTLR4_WITH_STATIC_CRT OFF) - # Use slightly more recent commit than 4.9.2 to deal with utfcpp test - # compilation problems - # set(ANTLR4_TAG tags/4.9.2) - set(ANTLR4_TAG 916f03366edf15bf8b50010b11d479c189bf9f96) + # 4.9.3 is the latest ANTLR4 version + set(ANTLR4_TAG tags/4.9.3) -include(ExternalAntlr4Cpp) +find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime) +set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER}) diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index c1fca79f81c6..2e5501afb2dd 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "22.4.0"; + version = "22.5.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-bloBP5cKZtvu96HSQ4AmZ5+VeSXGkmN/m4fuyHLrBws="; + sha256 = "sha256-/La54qrejUhyoA1fRPEIItlKojTP5n5YmH+ovL6ASGk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix new file mode 100644 index 000000000000..92ccba675e0c --- /dev/null +++ b/pkgs/development/python-modules/cloup/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, click +, setuptools-scm +, pythonOlder +}: + +buildPythonPackage rec { + pname = "cloup"; + version = "0.14.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "4dec7e43905b7771884cda4f13ab8b7537bceaee467a92655e7660797ab08c47"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + click + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "cloup" ]; + + meta = with lib; { + homepage = "https://github.com/janLuke/cloup"; + description = "Click extended with option groups, constraints, aliases, help themes"; + longDescription = '' + Enriches Click with option groups, constraints, command aliases, help sections for subcommands, themes for --help and other stuff. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ friedelino ]; + }; +} diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix index 1c57744c797a..e24235203ebb 100644 --- a/pkgs/development/python-modules/crownstone-uart/default.nix +++ b/pkgs/development/python-modules/crownstone-uart/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crownstone-uart"; - version = "2.4.0"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-uart"; rev = version; - sha256 = "sha256-oCPv4siGy0POK6XeY29roKO/t8xMcJkwSO1onGNLq3E="; + sha256 = "sha256-NGy63o56oWhHcQ9QKo05k/z8ABp3p3T3+uY2O1YyzBk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index 7b0dcaca25e3..430047cb790c 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -7,15 +7,19 @@ , fetchPypi , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "0.7.3"; pname = "dask-jobqueue"; + version = "0.7.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "682d7cc0e6b319b6ab83a7a898680c12e9c77ddc77df380b40041290f55d4e79"; + hash = "sha256-aC18wOazGbarg6eomGgMEunHfdx33zgLQAQSkPVdTnk="; }; propagatedBuildInputs = [ @@ -39,12 +43,14 @@ buildPythonPackage rec { "test_security" ]; - pythonImportsCheck = [ "dask_jobqueue" ]; + pythonImportsCheck = [ + "dask_jobqueue" + ]; meta = with lib; { broken = stdenv.isDarwin; - homepage = "https://github.com/dask/dask-jobqueue"; description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; + homepage = "https://github.com/dask/dask-jobqueue"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index 15f0b315e9f0..ecc5ebf60942 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -4,27 +4,38 @@ , dask , distributed , mpi4py +, pythonOlder }: buildPythonPackage rec { - version = "2022.4.0"; pname = "dask-mpi"; + version = "2022.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CgTx19NaBs3/UGWTMw1EFOokLJFySYzhkfV0LqxJnhc="; + hash = "sha256-CgTx19NaBs3/UGWTMw1EFOokLJFySYzhkfV0LqxJnhc="; }; - propagatedBuildInputs = [ dask distributed mpi4py ]; + propagatedBuildInputs = [ + dask + distributed + mpi4py + ]; - # hardcoded mpirun path in tests + # Hardcoded mpirun path in tests doCheck = false; - pythonImportsCheck = [ "dask_mpi" ]; + + pythonImportsCheck = [ + "dask_mpi" + ]; meta = with lib; { - homepage = "https://github.com/dask/dask-mpi"; description = "Deploy Dask using mpi4py"; + homepage = "https://github.com/dask/dask-mpi"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 5c1840dff694..04a9586b40f4 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -63,7 +63,6 @@ buildPythonPackage rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "A Python interface for fplll"; changelog = "https://github.com/fplll/fpylll/releases/tag/${version}"; homepage = "https://github.com/fplll/fpylll"; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index c14598a8ebae..85ac03ba3eb4 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "1.9.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "allenporter"; repo = "python-google-nest-sdm"; - rev = version; - sha256 = "sha256-FHa6/oWV35TPsafgEUTCuu0Rnd1/YBZF3mHOhkVuEU0="; + rev = "refs/tags/${version}"; + sha256 = "sha256-af1oYeNEQdz6HivAhvQY0xm3J4s+uXpcdema37oG15U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 1f1c0ec7a8af..f39e62da0dca 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.7.0"; + version = "1.7.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Gu1yMLGkXmARNPX1Erjj1Py4APYAlQ4SI4PyG0QbYeY="; + sha256 = "sha256-lLv3DrBPxw5M903ehKMYqsbBicmXcVS2v7P7FgTNkSQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/isosurfaces/default.nix b/pkgs/development/python-modules/isosurfaces/default.nix new file mode 100644 index 000000000000..49f3fb90b296 --- /dev/null +++ b/pkgs/development/python-modules/isosurfaces/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + pname = "isosurfaces"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "fa1b44e5e59d2f429add49289ab89e36f8dcda49b7badd99e0beea273be331f4"; + }; + + propagatedBuildInputs = [ numpy ]; + + # no tests defined upstream + doCheck = false; + + pythonImportsCheck = [ "isosurfaces" ]; + + meta = with lib; { + homepage = "https://github.com/jared-hughes/isosurfaces"; + description = "Construct isolines/isosurfaces of a 2D/3D scalar field defined by a function"; + longDescription = '' + Construct isolines/isosurfaces of a 2D/3D scalar field defined by a + function, i.e. curves over which f(x,y)=0 or surfaces over which + f(x,y,z)=0. Most similar libraries use marching squares or similar over a + uniform grid, but this uses a quadtree to avoid wasting time sampling + many far from the implicit surface. + ''; + license = licenses.mit; + maintainers = with maintainers; [ friedelino ]; + }; +} diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index cff3ad1c737d..251eb44ecdfe 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.19.0"; + version = "1.20.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0UOU4arSCh+5l258mwZQLNf/JUbPcTgcHtusiTyYPwg="; + sha256 = "sha256-Qw6jgbYDfeJfT6QtIaT2llbfwZTpoLeH78mxJlFA7TI="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/mapbox-earcut/default.nix b/pkgs/development/python-modules/mapbox-earcut/default.nix new file mode 100644 index 000000000000..009bf2ed653c --- /dev/null +++ b/pkgs/development/python-modules/mapbox-earcut/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, numpy +, pybind11 +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "mapbox-earcut"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "skogler"; + repo = "mapbox_earcut_python"; + rev = "v${version}"; + sha256 = "m4q2qTL55fkdi3hm75C3/XV9SUQkpJS+B5SEgpPEctk="; + }; + + nativeBuildInputs = [ setuptools pybind11 ]; + + propagatedBuildInputs = [ numpy ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "mapbox_earcut" ]; + + meta = with lib; { + homepage = "https://github.com/skogler/mapbox_earcut_python"; + license = licenses.isc; + description = "Mapbox-earcut fast triangulation of 2D-polygons"; + longDescription = '' + Python bindings for the C++ implementation of the Mapbox Earcut + library, which provides very fast and quite robust triangulation of 2D + polygons. + ''; + maintainers = with maintainers; [ friedelino ]; + }; +} diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index e2a27b56cac1..fd2700f35fff 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - sha256 = "sha256-c6+kctEB4gwLGTgTA+sUA3v9ST4dn4RFPbyaXSgGvoQ="; + sha256 = "sha256-xlAQD0sJVhbr0nfJZdrBbskVbgC9Lrbrgu6rvT3jQCs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix new file mode 100644 index 000000000000..22e18e5975f2 --- /dev/null +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, flit-core +, requests +, pytestCheckHook +, responses +}: + +buildPythonPackage rec { + pname = "msgraph-core"; + version = "0.2.2"; + + disabled = pythonOlder "3.5"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "microsoftgraph"; + repo = "msgraph-sdk-python-core"; + rev = "v${version}"; + hash = "sha256-eRRlG3GJX3WeKTNJVWgNTTHY56qiUGOlxtvEZ2xObLA="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + disabledTestPaths = [ + "tests/integration" + ]; + + pythonImportsCheck = [ "msgraph.core" ]; + + meta = { + description = "Core component of the Microsoft Graph Python SDK"; + homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 79c48e57f2b0..e96a2b260b90 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -1,4 +1,5 @@ { lib +, aioresponses , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "0.9.13"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = version; - sha256 = "sha256-0VG8tSwbVTIIsQYAEwzQfXLTDy4df/nS/rbHjYo7xf0="; + sha256 = "sha256-f1IUyeOmRmnr7zWoMKF895FKsNgiiCbw7inmXDGZrVw="; }; propagatedBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { ]; checkInputs = [ + aioresponses requests-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 7cba1c227a85..c07a773eee17 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -1,26 +1,35 @@ { buildPythonPackage , fetchPypi , fetchurl -, pythonOlder , lib , nixosTests +, python +, pythonOlder # pythonPackages -, tqdm , dnspython , expiringdict -, urllib3 -, requests , publicsuffix2 , xmltodict , geoip2 +, urllib3 +, requests , imapclient , dateparser +, mailsuite +, elasticsearch , elasticsearch-dsl , kafka-python -, mailsuite +, tqdm , lxml , boto3 +, msgraph-core +, azure-identity +, google-api-core +, google-api-python-client +, google-auth +, google-auth-httplib2 +, google-auth-oauthlib }: let @@ -31,33 +40,49 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "7.0.1"; + version = "8.2.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1mi4hx410y7ikpfy1582lm252si0c3yryj0idqgqbx417fm21jjc"; + sha256 = "eb82328dffb4a62ddaefbcc22efd5a2694350504a56d41ba1e161f2d998dcbff"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "elasticsearch<7.14.0" "elasticsearch" + ''; + propagatedBuildInputs = [ - tqdm dnspython expiringdict - urllib3 - requests publicsuffix2 xmltodict geoip2 + urllib3 + requests imapclient dateparser + mailsuite + elasticsearch elasticsearch-dsl kafka-python - mailsuite + tqdm lxml boto3 + msgraph-core + azure-identity + google-api-core + google-api-python-client + google-auth + google-auth-httplib2 + google-auth-oauthlib ]; + # no tests on PyPI, no tags on GitHub + doCheck = false; + pythonImportsCheck = [ "parsedmarc" ]; passthru = { diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix index e967314c5e89..64903d79a391 100644 --- a/pkgs/development/python-modules/pypoolstation/default.nix +++ b/pkgs/development/python-modules/pypoolstation/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pypoolstation"; - version = "0.4.2"; + version = "0.4.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyPoolstation"; inherit version; - sha256 = "sha256-86y/JnTSV+MEr0np3bbwqFMkVrWpMAeyn9WVuNod9xQ="; + sha256 = "sha256-MG2V7/AqgH4OVcOEDdhwQswt96URJBQtoi1i+n4IV7Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix index 3003dddce6de..fa4493916410 100644 --- a/pkgs/development/python-modules/sdds/default.nix +++ b/pkgs/development/python-modules/sdds/default.nix @@ -3,27 +3,37 @@ , fetchFromGitHub , numpy , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "sdds"; - version = "0.2.1"; + version = "0.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "pylhc"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-JcxcF0tDigZz3upzE7rPDynCH45dnLk/zpS0a2dOwRU="; + rev = "refs/tags/${version}"; + hash = "sha256-l9j+YJ5VNMzL6JW59kq0hQS7XIj53UxW5bNnfdURz/o="; }; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; - pythonImportsCheck = [ "sdds" ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sdds" + ]; meta = with lib; { - description = "Python 3 package to handle SDDS files"; + description = "Module to handle SDDS files"; homepage = "https://pylhc.github.io/sdds/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 720129a13faa..2f488d3cd80f 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.05.1"; + version = "2022.05.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-tYExqOIJPJN8Lss6y0oelkrDuQCpNtFrsFRCxnbUNvU="; + sha256 = "sha256-DWhXNn5KNs06oKJbWTCI/vuX2oruERAgb/1f4Au8na0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix new file mode 100644 index 000000000000..b6a5f4df097d --- /dev/null +++ b/pkgs/development/python-modules/srt/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "srt"; + version = "3.5.2"; + + disabled = pythonOlder "2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "7aa4ad5ce4126d3f53b3e7bc4edaa86653d0378bf1c0b1ab8c59f5ab41384450"; + }; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ "srt" ]; + + meta = with lib; { + homepage = "https://github.com/cdown/srt"; + description = "A tiny but featureful Python library for parsing, modifying, and composing SRT files"; + license = licenses.bsd3; + maintainers = with maintainers; [ friedelino ]; + }; +} diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 40b6b47a946d..81e447457c5a 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.63.1"; + version = "4.64.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QjCkkRmkFsiMxH0NLTLV2Q8aKC1eSX1JgBlQcE5Jhj0="; + sha256 = "13a0spki37rdbx54nspcni3bpsp4d7p5ln570yipf1r01v9mbgj0"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index 6355e37bd64d..b1dc6ac48cf2 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "vulcan-api"; - version = "2.0.3"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "kapi2289"; repo = pname; rev = "v${version}"; - sha256 = "YLt9yufOBlWRyo+le7HcaFD/s7V5WpvhMUrHJqyC3pY="; + sha256 = "sha256-XYpQ1uqRmdqsGeKyHKGxFyXMN9HugTiPUx9tFUiGSpU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index d0f938c6a8bf..197b677e741b 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.36.1"; + version = "0.37.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-XVFOx0f5lBh5i7q8XEb4qd0Lu09jEEYKyJUJBqXwirc="; + hash = "sha256-321voxogSkeHMsMdLnrjwG3vQOgGDcMjDen0EUKYE1U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/beancount-language-server/default.nix b/pkgs/development/tools/beancount-language-server/default.nix new file mode 100644 index 000000000000..1766f22ee180 --- /dev/null +++ b/pkgs/development/tools/beancount-language-server/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "beancount-language-server"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "polarmutex"; + repo = "beancount-language-server"; + rev = "v${version}"; + sha256 = "sha256-CkwNxamkErRo3svJNth2F8NSqlJNX+1S/srKu6Z+mX4="; + }; + + cargoSha256 = "sha256-NTUs9ADTn+KoE08FikRHrdptZkrUqnjVIlcr8RtDvic="; + + doInstallCheck = true; + postInstallCheck = '' + $out/bin/beancount-language-server --help > /dev/null + ''; + + meta = with lib; { + description = "A Language Server Protocol (LSP) for beancount files"; + homepage = "https://github.com/polarmutex/beancount-language-server"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ polarmutex ]; + }; +} + diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 43ed263477bd..af1e60505584 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.35.2"; + version = "3.36.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-BpfWeSEX4N77yXfWKpH7KWKsncdOYquxF+L+g13DdiA="; + sha256 = "sha256-Q1ul4YF6iBi6aCd9TiD0yjUUJx9OfsoyNWeevwvISBs="; }; - vendorSha256 = "sha256-E51LBpNN/N3wH1LMxv/+nnwpQAxHhyDW2jgVIDkNeQ4="; + vendorSha256 = "sha256-5K1xnfQ4U39WR8agOH8zYrvFS1gbr/ahEVTXlAzILL4="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/development/tools/parsing/antlr/4.9.nix b/pkgs/development/tools/parsing/antlr/4.9.nix index efc478ecd987..bdb373f243f8 100644 --- a/pkgs/development/tools/parsing/antlr/4.9.nix +++ b/pkgs/development/tools/parsing/antlr/4.9.nix @@ -2,12 +2,12 @@ , fetchpatch, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, utf8cpp, darwin }: let - version = "4.9.2"; + version = "4.9.3"; source = fetchFromGitHub { owner = "antlr"; repo = "antlr4"; rev = version; - sha256 = "0rpqgl2y22iiyg42y8jyiy2g7x421yf0q16cf17j76iai6y0bm5p"; + sha256 = "1af3cfqwk7lq1b5qsh1am0922fyhy7wmlpnrqdnvch3zzza9n1qm"; }; runtime = { @@ -18,14 +18,6 @@ let outputs = [ "out" "dev" "doc" ]; - patches = [ - (fetchpatch { - name = "use-utfcpp-from-system.patch"; - url = "https://github.com/antlr/antlr4/commit/5a808b470e1314b63b0a921178040ccabb357945.patch"; - sha256 = "0nq7iajy9inllcspyqpxskfg3k5s1fwm7ph75i8lfc25rl35k1w7"; - }) - ]; - patchFlags = [ "-p3" ]; nativeBuildInputs = [ cmake ninja pkg-config ]; @@ -52,7 +44,7 @@ let src = fetchurl { url = "https://www.antlr.org/download/antlr-${version}-complete.jar"; - sha256 = "1k9pw5gv2zhh06n1vys76kchlz4mz0vgv3iiba8w47b9fqa7n4dv"; + sha256 = "0dnz2x54kigc58bxnynjhmr5iq49f938vj6p50gdir1xdna41kdg"; }; dontUnpack = true; diff --git a/pkgs/os-specific/linux/new-lg4ff/default.nix b/pkgs/os-specific/linux/new-lg4ff/default.nix new file mode 100644 index 000000000000..df2b66e9079a --- /dev/null +++ b/pkgs/os-specific/linux/new-lg4ff/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, kernel, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "new-lg4ff"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "berarma"; + repo = "new-lg4ff"; + rev = "${version}"; + sha256 = "+05xDpNI4m6wTS+YPgA0fP4iM10nMOZOtCrdQxpevBU="; + }; + + preBuild = '' + substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install" + sed -i '/depmod/d' Makefile + sed -i "10i\\\trmmod hid-logitech 2> /dev/null || true" Makefile + sed -i "11i\\\trmmod hid-logitech-new 2> /dev/null || true" Makefile + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "KVERSION=${kernel.modDirVersion}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + meta = with lib; { + description = "Experimental Logitech force feedback module for Linux"; + homepage = "https://github.com/berarma/new-lg4ff"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ matthiasbenaets ]; + platforms = platforms.linux; + broken = stdenv.isAarch64; + }; +} diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 502e92a1baea..657ac293e562 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-05-25"; + version = "2022-06-01"; pname = "oh-my-zsh"; - rev = "e9e8c6b54d594109041bdd4bc3902b40f9ae8849"; + rev = "18e7e5d0339f3491a6c0324e2443415309b56173"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "afSA6OJm1ydw0/yBZx9QLyt4z7nWjQBAb+77Gw6nR4g="; + sha256 = "NAVotL5RxpS/zKnO+ngMIjv787lqc1dj/c4blQrQcvU="; }; strictDeps = true; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index f5cd6f03b963..549096ec0e43 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,10 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, xorg, xkeyboard_config, zlib -, libjpeg_turbo, pixman, fltk -, cmake, gettext, libtool +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, xorg +, xkeyboard_config +, zlib +, libjpeg_turbo +, pixman +, fltk +, cmake +, gettext +, libtool , libGLU -, gnutls, pam, nettle -, xterm, openssh, perl +, gnutls +, gawk +, pam +, nettle +, xterm +, openssh +, perl , makeWrapper , nixosTests }: @@ -31,7 +45,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = '' + postPatch = lib.optionalString stdenv.isLinux '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in fontPath= substituteInPlace vncviewer/vncviewer.cxx \ @@ -39,6 +53,10 @@ stdenv.mkDerivation rec { cp unix/xserver21.1.1.patch unix/xserver211.patch source_top="$(pwd)" + '' + '' + # On Mac, do not build a .dmg, instead copy the .app to the source dir + gawk -i inplace 'BEGIN { del=0 } /hdiutil/ { del=2 } del<=0 { print } /$VERSION.dmg/ { del -= 1 }' release/makemacapp.in + echo "mv \"\$APPROOT\" \"\$SRCDIR/\"" >> release/makemacapp.in ''; dontUseCmakeBuildDir = true; @@ -49,7 +67,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "out"}/bin" ]; - postBuild = '' + postBuild = lib.optionalString stdenv.isLinux '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast" export CXXFLAGS="$CXXFLAGS -fpermissive" # Build Xvnc @@ -76,9 +94,11 @@ stdenv.mkDerivation rec { --with-xkb-output=$out/share/X11/xkb/compiled make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../.. -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES popd + '' + lib.optionalString stdenv.isDarwin '' + make dmg ''; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' pushd unix/xserver/hw/vnc make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../../../.. install popd @@ -86,21 +106,54 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/vncserver \ --prefix PATH : ${lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) } + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv 'TigerVNC Viewer ${version}.app' $out/Applications/ + rm $out/bin/vncviewer + echo "#!/usr/bin/env bash + open $out/Applications/TigerVNC\ Viewer\ ${version}.app --args \$@" >> $out/bin/vncviewer + chmod +x $out/bin/vncviewer ''; - buildInputs = with xorg; [ - libjpeg_turbo fltk pixman - gnutls pam nettle perl + buildInputs = [ + fltk + gnutls + libjpeg_turbo + pixman + gawk + ] ++ lib.optionals stdenv.isLinux (with xorg; [ + nettle + pam + perl xorgproto - utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft - libxkbfile libXfont2 libpciaccess + utilmacros + libXtst + libXext + libX11 + libXext + libICE + libXi + libSM + libXft + libxkbfile + libXfont2 + libpciaccess libGLU - ] ++ xorg.xorgserver.buildInputs; + ] ++ xorg.xorgserver.buildInputs + ); - nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil makeWrapper ] - ++ xorg.xorgserver.nativeBuildInputs; + nativeBuildInputs = [ + cmake + gettext + ] ++ lib.optionals stdenv.isLinux (with xorg; [ + fontutil + libtool + makeWrapper + utilmacros + zlib + ] ++ xorg.xorgserver.nativeBuildInputs); - propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; + propagatedBuildInputs = lib.optional stdenv.isLinux xorg.xorgserver.propagatedBuildInputs; passthru.tests.tigervnc = nixosTests.vnc.testTigerVNC; @@ -109,7 +162,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; description = "Fork of tightVNC, made in cooperation with VirtualGL"; maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; + platforms = lib.platforms.unix; # Prevent a store collision. priority = 4; }; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 4d83b693075b..7a6a34949204 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -83,7 +83,7 @@ pythonPackages.buildPythonApplication rec { paramiko pyasn1 pycrypto - pydrive + pydrive2 future ] ++ lib.optionals (!isPy3k) [ enum diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 90b29d80ac18..32d5b5712da8 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -1,18 +1,32 @@ -{ lib, buildPythonApplication, fetchPypi, installShellFiles }: +{ lib +, python3 +, substituteAll +, ffmpeg +, installShellFiles +}: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "you-get"; - version = "0.4.1602"; + version = "0.4.1612"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. doCheck = false; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-RwbAbMS5CA6pO08TuaTb67YM/hLRkceOF7D6iV0XcI8="; + sha256 = "sha256-lKEztwwn1pnALuwDiA1Ik9+XCVyO+UMobv+hXu0mn5w="; }; + patches = [ + (substituteAll { + src = ./ffmpeg-path.patch; + ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg"; + ffprobe = "${lib.getBin ffmpeg}/bin/ffmpeg"; + version = lib.getVersion ffmpeg; + }) + ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -25,7 +39,6 @@ buildPythonApplication rec { meta = with lib; { description = "A tiny command line utility to download media contents from the web"; homepage = "https://you-get.org"; - changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ryneeverett ]; }; diff --git a/pkgs/tools/misc/you-get/ffmpeg-path.patch b/pkgs/tools/misc/you-get/ffmpeg-path.patch new file mode 100644 index 000000000000..abbd0be9d3e1 --- /dev/null +++ b/pkgs/tools/misc/you-get/ffmpeg-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py +index 50e2c9f..46e7f61 100755 +--- a/src/you_get/processor/ffmpeg.py ++++ b/src/you_get/processor/ffmpeg.py +@@ -31,7 +31,7 @@ def get_usable_ffmpeg(cmd): + except: + return None + +-FFMPEG, FFPROBE, FFMPEG_VERSION = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv') or (None, None, None) ++FFMPEG, FFPROBE, FFMPEG_VERSION = ('@ffmpeg@', '@ffprobe@', '@version@') + if logging.getLogger().isEnabledFor(logging.DEBUG): + LOGLEVEL = ['-loglevel', 'info'] + STDIN = None diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix index 2159322a5870..2b47767b5da4 100644 --- a/pkgs/tools/wayland/swaysome/default.nix +++ b/pkgs/tools/wayland/swaysome/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swaysome"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitLab { owner = "hyask"; repo = pname; rev = version; - sha256 = "sha256-hI6XPND05m67dxo9EwIDhFTyC2UrL4Ll1V/WcBoJymU="; + sha256 = "sha256-E2Oy8ubH4VIpuH4idYNiZJISuYYe+stcUY/atN2JcVw="; }; - cargoSha256 = "sha256-jG6HZiL2almALyEnQRmbeCTRG11URP3+Bxqyn8hLs7w="; + cargoSha256 = "sha256-S+GcyEYQ4nnVoPMuglTmFdP5j015UyCXMyyhPHa5m8k="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2090737600be..6747312f6450 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11944,7 +11944,7 @@ with pkgs; yle-dl = callPackage ../tools/misc/yle-dl {}; - you-get = python3Packages.callPackage ../tools/misc/you-get { }; + you-get = callPackage ../tools/misc/you-get { }; zasm = callPackage ../development/compilers/zasm {}; @@ -15088,7 +15088,9 @@ with pkgs; bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; - buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; + buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { + buildGoModule = buildGo118Module; + }; buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; @@ -23095,6 +23097,10 @@ with pkgs; stdenv = gcc11Stdenv; }; + new-lg4ff = callPackage ../os-specific/linux/new-lg4ff { + inherit (linuxPackages) kernel; + }; + nmon = callPackage ../os-specific/linux/nmon { }; hwdata = callPackage ../os-specific/linux/hwdata { }; @@ -26801,9 +26807,7 @@ with pkgs; m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; - manim = python3Packages.callPackage ../applications/video/manim { - opencv = python3Packages.opencv3; - }; + manim = callPackage ../applications/video/manim { }; manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; @@ -31336,6 +31340,8 @@ with pkgs; beancount = with python3.pkgs; toPythonApplication beancount; + beancount-language-server = callPackage ../development/tools/beancount-language-server {}; + bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec5ed490ba6f..4acdb5c79c6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1763,6 +1763,8 @@ in { cloudsplaining = callPackage ../development/python-modules/cloudsplaining { }; + cloup = callPackage ../development/python-modules/cloup { }; + clustershell = callPackage ../development/python-modules/clustershell { }; clvm = callPackage ../development/python-modules/clvm { }; @@ -4341,6 +4343,8 @@ in { isort = callPackage ../development/python-modules/isort { }; + isosurfaces = callPackage ../development/python-modules/isosurfaces { }; + isounidecode = callPackage ../development/python-modules/isounidecode { }; isoweek = callPackage ../development/python-modules/isoweek { }; @@ -5164,6 +5168,8 @@ in { mapbox = callPackage ../development/python-modules/mapbox { }; + mapbox-earcut = callPackage ../development/python-modules/mapbox-earcut { }; + mariadb = callPackage ../development/python-modules/mariadb { }; marisa-trie = callPackage ../development/python-modules/marisa-trie { }; @@ -6386,6 +6392,8 @@ in { micloud = callPackage ../development/python-modules/micloud { }; + msgraph-core = callPackage ../development/python-modules/msgraph-core { }; + netmap = callPackage ../development/python-modules/netmap { }; openai = callPackage ../development/python-modules/openai { }; @@ -9970,6 +9978,8 @@ in { srsly = callPackage ../development/python-modules/srsly { }; + srt = callPackage ../development/python-modules/srt { }; + srvlookup = callPackage ../development/python-modules/srvlookup { }; ssdeep = callPackage ../development/python-modules/ssdeep { diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 9ef47c873ba5..4d66d838dd2b 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -17,4 +17,7 @@ let in (qt6 // { + # LIBRARIES + + quazip = callPackage ../development/libraries/quazip { }; })))