From 42f6c2c7ed3e5c9b27c7f05415ba0d22913fa3bd Mon Sep 17 00:00:00 2001 From: ReplayCoding Date: Mon, 14 Mar 2022 15:57:16 -0700 Subject: [PATCH 01/99] python: fix enableOptimizations with clang --- pkgs/development/interpreters/python/cpython/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 1bcbd2bb4b5e..642608a72228 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -63,9 +63,6 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; -assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang)) - "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found."; - assert lib.assertMsg (reproducibleBuild -> stripBytecode) "Deterministic builds require stripping bytecode."; @@ -111,7 +108,7 @@ let ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc pythonForBuild - ] ++ optionals (stdenv.cc.isClang && enableLTO) [ + ] ++ optionals (stdenv.cc.isClang && (enableLTO || enableOptimizations)) [ stdenv.cc.cc.libllvm.out ]; From 47473d4ad993b28f7cf1b03d95335cc79795ff53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 May 2022 10:20:42 +0200 Subject: [PATCH 02/99] python310Packages.vulcan-api: 2.0.3 -> 2.1.1 --- pkgs/development/python-modules/vulcan-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From c047171df6b1790d0a8776099cfe55059c8ac4e2 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Tue, 10 May 2022 21:57:23 +0000 Subject: [PATCH 03/99] python39Packages.nbclient.passthru.tests.check: fix tests --- .../python-modules/nbclient/default.nix | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 7311384229aa..84fe03be605b 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,16 +1,18 @@ -{ lib +{ async_generator , buildPythonPackage -, fetchPypi -, pythonOlder -, async_generator -, traitlets +, fetchFromGitHub +, ipykernel +, ipywidgets +, jupyter-client +, lib +, nbconvert , nbformat , nest-asyncio -, jupyter-client +, pytest-asyncio , pytestCheckHook +, pythonOlder +, traitlets , xmltodict -, nbconvert -, ipywidgets }: let nbclient = buildPythonPackage rec { @@ -20,9 +22,11 @@ let nbclient = buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-uAcm/B+4mg6Pi+HnfijQAmsejtkLwUPIoMdiLk+M3Z4="; + src = fetchFromGitHub { + owner = "jupyter"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-ofyJNJeNkXbZ9qHLTuzJ13PgEXU9lDQ9NkT4nG/R8Ic="; }; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; @@ -30,7 +34,14 @@ let nbclient = buildPythonPackage rec { # circular dependencies if enabled by default doCheck = false; - checkInputs = [ pytestCheckHook xmltodict nbconvert ipywidgets ]; + checkInputs = [ + ipykernel + ipywidgets + nbconvert + pytest-asyncio + pytestCheckHook + xmltodict + ]; preCheck = '' export HOME=$(mktemp -d) From 939cdf5d46adee9dfadc8dc7634f4edc1c9e68f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 May 2022 17:23:54 +0200 Subject: [PATCH 04/99] python310Packages.nexia: 0.9.13 -> 1.0.0 --- pkgs/development/python-modules/nexia/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 79c48e57f2b0..90eb080d077a 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.0"; 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-TMcRAQylZU7Jt0X9JpKh7h63QSmLc/cZ2gSyDbuipj8="; }; propagatedBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { ]; checkInputs = [ + aioresponses requests-mock pytestCheckHook ]; From 09d7db1e99f190b4d747c882a00f651cf61cc2ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 May 2022 23:11:40 +0200 Subject: [PATCH 05/99] python310Packages.nexia: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/nexia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 90eb080d077a..e96a2b260b90 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = version; - sha256 = "sha256-TMcRAQylZU7Jt0X9JpKh7h63QSmLc/cZ2gSyDbuipj8="; + sha256 = "sha256-f1IUyeOmRmnr7zWoMKF895FKsNgiiCbw7inmXDGZrVw="; }; propagatedBuildInputs = [ From 8fdfe10bcffab56ab95d7e092acd9d8b9157e65c Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 18 Mar 2022 18:30:32 -0300 Subject: [PATCH 06/99] lean2: 2017-07-22 -> 2018-10-01, unbreak --- .../science/logic/lean2/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/science/logic/lean2/default.nix diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix new file mode 100644 index 000000000000..e30b8af04735 --- /dev/null +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, gmp, mpfr, python3 +, jemalloc, ninja, makeWrapper }: + +stdenv.mkDerivation { + pname = "lean2"; + version = "2018-10-01"; + + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean2"; + rev = "8072fdf9a0b31abb9d43ab894d7a858639e20ed7"; + sha256 = "12bscgihdgvaq5xi0hqf5r4w386zxm3nkx1n150lv5smhg8ga3gg"; + }; + + patches = [ + # https://github.com/leanprover/lean2/pull/13 + (fetchpatch { + name = "lean2-fix-compilation-error.patch"; + url = "https://github.com/collares/lean2/commit/09b316ce75fd330b3b140d138bcdae2b0e909234.patch"; + sha256 = "060mvqn9y8lsn4l20q9rhamkymzsgh0r1vzkjw78gnj8kjw67jl5"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper ninja ]; + buildInputs = [ gmp mpfr python3 jemalloc ]; + + preConfigure = '' + patchShebangs bin/leantags + cd src + ''; + + cmakeFlags = [ "-GNinja" ]; + + postInstall = '' + wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin + ''; + + meta = with lib; { + description = "Automatic and interactive theorem prover (version with HoTT support)"; + homepage = "http://leanprover.github.io"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice gebner ]; + broken = stdenv.isAarch64; + mainProgram = "lean"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 743d67d5d6aa..8a610240574d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33276,6 +33276,7 @@ with pkgs; keymapviz = callPackage ../tools/misc/keymapviz { }; lean = callPackage ../applications/science/logic/lean {}; + lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; elan = callPackage ../applications/science/logic/elan {}; mathlibtools = with python3Packages; toPythonApplication mathlibtools; From 386ccee2fb2df8f671584cb73ec1eb2b7114fdaa Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Mon, 23 May 2022 09:44:02 +0200 Subject: [PATCH 07/99] ntfy-sh: 1.22.0 -> 1.23.0 --- pkgs/tools/misc/ntfy-sh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 68275f4c7014..ca45473c1748 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-30j62GaO5SXG78c6vMpLZ+ixy1zesjXoX3L9Et/7uhU="; + sha256 = "sha256-eWVcMHP/YJxlxVRYLfnizbAeCqmtkHGaUG/oibCpDVU="; }; - vendorSha256 = "sha256-Sx6l5GJ72A0SHEHyVtlte8Ed9fuJzZAkJzC0zpCbvK8="; + vendorSha256 = "sha256-axuZKkKAnlPQeuTIfYTWF5WqgPYxVttIlFE/e1qv6pc="; doCheck = false; preBuild = '' - make server-deps-static-sites + make cli-deps-static-sites ''; meta = with lib; { From 2654e44f04965a82cc4d37eb1343b268364c13fa Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Mon, 23 May 2022 10:46:57 +0200 Subject: [PATCH 08/99] swaysome: 1.1.4 -> 1.1.5 --- pkgs/tools/wayland/swaysome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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"; From ec44e2cc3923b85ea5a53155e6d79ef6ff65e064 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Tue, 24 May 2022 08:51:46 +0200 Subject: [PATCH 09/99] dbeaver: 22.0.2 -> 22.0.5 --- pkgs/applications/misc/dbeaver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 439067187c2d..4682c17ddba3 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -23,16 +23,16 @@ inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { pname = "dbeaver"; - version = "22.0.2"; # When updating also update mvnSha256 + version = "22.0.5"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-3tIxHw4734ggIUDjZO2EGIMbyPNP3yvy9QgnMLw+/fc="; + sha256 = "sha256-P+t1wtMTVKbfEXCFuz8zPNy3z4YysJRyOvTxiDFlp2c="; }; - mvnSha256 = "os3eb+In8XreHwdZMacXafIVgOAeSSfCIkO5pwaO6MI="; + mvnSha256 = "veclFlzLhTU+nT360qxRNut+yEi2dfTBxdQASyRMqhI="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ From 9c3e9279495ba48e37e999ee0d3cc3731d6f0b6c Mon Sep 17 00:00:00 2001 From: Frido Friedemann Date: Tue, 24 May 2022 13:03:12 +0200 Subject: [PATCH 10/99] manim: remove to be replaced by ManimCE Existing manim package has been incorrectly named manim, although on PyPi it is called manimlib. It is now developed under the name manimgl, so the PyPi package manimlib will receive no further updates. The new manim package in nixpkgs is now the Manim Community Edition. --- pkgs/applications/video/manim/default.nix | 64 ------------------- .../manim/remove-dependency-constraints.patch | 26 -------- pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 94 deletions(-) delete mode 100644 pkgs/applications/video/manim/default.nix delete mode 100644 pkgs/applications/video/manim/remove-dependency-constraints.patch diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix deleted file mode 100644 index 5da81eff50e6..000000000000 --- a/pkgs/applications/video/manim/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ 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"; - - src = fetchPypi { - pname = "manimlib"; - inherit version; - sha256 = "0vg9b3rwypq5zir74pi0pmj47yqlcg7hrvscwrpjzjbqq2yihn49"; - }; - - patches = [ ./remove-dependency-constraints.patch ]; - - nativeBuildInputs = [ pbr ]; - - propagatedBuildInputs = [ - colour - numpy - pillow - progressbar - scipy - tqdm - opencv - pycairo - pydub - - cairo sox ffmpeg xdg-utils - ]; - - # 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 - ''; - - disabled = pythonOlder "3.7"; - - meta = { - description = "Animation engine for explanatory math videos"; - 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. - ''; - homepage = "https://github.com/3b1b/manim"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ johnazoidberg ]; - }; -} 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc5b53ab2925..be21b37ac762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26739,10 +26739,6 @@ with pkgs; m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; - manim = python3Packages.callPackage ../applications/video/manim { - opencv = python3Packages.opencv3; - }; - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; From fa4ab568a6ee556a235c91d60f6d22bb7d5973fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 May 2022 00:55:25 +0200 Subject: [PATCH 11/99] python310Packages.zha-quirks: 0.0.73 -> 0.0.74 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 33d0bea9b838..cb667e48518e 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.73"; + version = "0.0.74"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-vC1kkh9t2fWmSqmKQz9ON8Y+tBFhTxrprLNzOldQR+A="; + hash = "sha256-W1EToFt+jZ21jEdQZomKB5Co25mcuf/QMJMs1c2kacY="; }; propagatedBuildInputs = [ From bb3d32f71606ae093ecca42162476a5bed4a6e6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 May 2022 00:59:44 +0200 Subject: [PATCH 12/99] python310Packages.zwave-js-server-python: 0.36.1 -> 0.37.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 446c6b36abef308050d286ee8cd046ddc11c6e5a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sun, 22 May 2022 22:56:07 -0400 Subject: [PATCH 13/99] buildkite-agent: 3.35.2 -> 3.36.1 --- .../continuous-integration/buildkite-agent/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e50917ea399a..2af963a42c95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15055,7 +15055,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 { }; From 106bfcaf8a916650f01df5498020e273905c2172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 27 May 2022 17:17:16 +0200 Subject: [PATCH 14/99] nixos/openconnect: add autoStart option --- nixos/modules/services/networking/openconnect.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix index de4b505130eb..bc873b2198bc 100644 --- a/nixos/modules/services/networking/openconnect.nix +++ b/nixos/modules/services/networking/openconnect.nix @@ -9,6 +9,12 @@ let }; interfaceOptions = { options = { + autoStart = mkOption { + default = true; + description = "Whether this VPN connection should be started automatically."; + type = types.bool; + }; + gateway = mkOption { description = "Gateway server to connect to."; example = "gateway.example.com"; @@ -95,7 +101,7 @@ let description = "OpenConnect Interface - ${name}"; requires = [ "network-online.target" ]; after = [ "network.target" "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = optional icfg.autoStart "multi-user.target"; serviceConfig = { Type = "simple"; From 06f3bb21cde622fb6ffe08e85253ea3a18a81ef1 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 28 May 2022 18:11:34 -0700 Subject: [PATCH 15/99] universal-ctags: 5.9.20220220.0 -> 5.9.20220529.0 --- pkgs/development/tools/misc/universal-ctags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 240d8a1f10d4..7b097d221262 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "universal-ctags"; - version = "5.9.20220220.0"; + version = "5.9.20220529.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; rev = "p${version}"; - sha256 = "1118iq33snxyw1jk8nwvsl08f3zdainksh0yiapzvg0y5906jjjd"; + sha256 = "sha256-Lu4eYMA5Uf/A8r11W6v7xTAnj0gtCjKQ4aX5IbV0dbo="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 58fabf558bf98a6436674ba75aaaa2b98684c78d Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 28 May 2022 18:17:45 -0700 Subject: [PATCH 16/99] universal-ctags: set meta.mainProgram --- pkgs/development/tools/misc/universal-ctags/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 7b097d221262..c3bf856bc9bc 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # universal-ctags is preferred over emacs's ctags priority = 1; + mainProgram = "ctags"; maintainers = [ maintainers.mimame ]; }; } From c2755427d67bbcdf0e05609d52e8674d1ea0c1e9 Mon Sep 17 00:00:00 2001 From: Frido Friedemann Date: Fri, 23 Apr 2021 00:06:04 +0200 Subject: [PATCH 17/99] python3Packages.mapbox-earcut: init at 2.2.2 --- .../python-modules/mapbox-earcut/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/mapbox-earcut/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34a318a6e077..5011f51be687 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5121,6 +5121,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 { }; From 6ab6d7f9f66ec353c03610fc40d49f88d84084ec Mon Sep 17 00:00:00 2001 From: Frido Friedemann Date: Tue, 28 Dec 2021 22:39:58 +0100 Subject: [PATCH 18/99] python3Packages.cloup: init at 0.14.0 --- .../python-modules/cloup/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/cloup/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5011f51be687..f19623c93a74 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1757,6 +1757,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 { }; From d37086b4bf4612d0658f1a4786a4bd37bdbe378a Mon Sep 17 00:00:00 2001 From: Frido Friedemann Date: Thu, 30 Dec 2021 00:53:42 +0100 Subject: [PATCH 19/99] python3Packages.isosurfaces: init at 0.1.0 --- .../python-modules/isosurfaces/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/isosurfaces/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f19623c93a74..d38627e7e75c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4303,6 +4303,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 { }; From 00bcf6729290ce4d155e057beb3c1f264ad09228 Mon Sep 17 00:00:00 2001 From: Frido Friedemann Date: Tue, 17 May 2022 19:25:47 +0200 Subject: [PATCH 20/99] python3Packages.srt: init at 3.5.2 --- .../python-modules/srt/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/srt/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d38627e7e75c..92d4f527a687 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9915,6 +9915,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 { From 81c384a4c02f59134566d555b3776aaefb1216ed Mon Sep 17 00:00:00 2001 From: Frido Friedemann Date: Tue, 24 May 2022 13:19:46 +0200 Subject: [PATCH 21/99] manim: init at 0.15.2 --- pkgs/applications/video/manim/default.nix | 134 ++++++++++++++++++ .../video/manim/failing_tests.nix | 74 ++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 210 insertions(+) create mode 100644 pkgs/applications/video/manim/default.nix create mode 100644 pkgs/applications/video/manim/failing_tests.nix diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix new file mode 100644 index 000000000000..edc084ef6a0f --- /dev/null +++ b/pkgs/applications/video/manim/default.nix @@ -0,0 +1,134 @@ +{ lib +, fetchFromGitHub + +, 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="; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'cloup = "^0.13.0"' 'cloup = "*"' \ + --replace 'mapbox-earcut = "^0.12.10"' 'mapbox-earcut = "*"' \ + ''; + + buildInputs = [ cairo ]; + + 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. This is the community maintained version of + manim. + ''; + 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be21b37ac762..2edcae1efbb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26739,6 +26739,8 @@ with pkgs; m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; + manim = callPackage ../applications/video/manim { }; + manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; From 67832a5f0f24bdd6316b7a90a92cfd7a0953e077 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sun, 29 May 2022 19:19:24 -0700 Subject: [PATCH 22/99] svd2rust: 0.21.0 -> 0.24.0 --- pkgs/development/tools/rust/svd2rust/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 20501594c439..dbd0876eb545 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.21.0"; + version = "0.24.0"; src = fetchCrate { inherit pname version; - sha256 = "0mxzbbxrg1jysxpjqcvgwwmh8qf0lyf64fl1gxxp0whph0x279qj"; + sha256 = "sha256-P0s2mrfYA7DUThvje0LH3Pq0Os6UZJrrnjnzAm8UlDQ="; }; - cargoSha256 = "0kvya6swx1nsxxlhn2w8x4dhl4j3v56jxqr2h259cx6lzv3xjhin"; + cargoSha256 = "sha256-TDgd8RG97ROeAQJ1uDF2m+yIa8US7zFz+5qrQtFbazE="; buildInputs = lib.optional stdenv.isDarwin libiconv; @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-embedded/svd2rust"; changelog = "https://github.com/rust-embedded/svd2rust/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ newam ]; }; } From bc555806c0259333ae64efe622d2d76d527974f8 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Mon, 30 May 2022 10:14:22 +0200 Subject: [PATCH 23/99] ntfy-sh: 1.23.0 -> 1.24.0 --- pkgs/tools/misc/ntfy-sh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index ca45473c1748..40a6c2d27f2c 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-eWVcMHP/YJxlxVRYLfnizbAeCqmtkHGaUG/oibCpDVU="; + sha256 = "sha256-Jw+8rgbevtk1Mzy/g+DryAk7a/RbQXpEtwPlqJRD/UM="; }; - vendorSha256 = "sha256-axuZKkKAnlPQeuTIfYTWF5WqgPYxVttIlFE/e1qv6pc="; + vendorSha256 = "sha256-MdbC+Hv8jSImg0d2HMeAmUdWLQT8+zSe+0mkIwHIJXM="; doCheck = false; From 8143329fc8bfa862c377e9aba9af44cc701ef6a8 Mon Sep 17 00:00:00 2001 From: Brian Ryall Date: Sun, 15 May 2022 10:46:17 -0400 Subject: [PATCH 24/99] maintainers: add polarmutex --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 99a75fa6bfea..30e4cc9d9c74 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10188,6 +10188,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"; From 76a10f36450fba0f8eff5e936cf80af810d00b73 Mon Sep 17 00:00:00 2001 From: wyndon Date: Tue, 31 May 2022 02:43:32 +0200 Subject: [PATCH 25/99] httm: 0.10.12 -> 0.10.15 --- pkgs/tools/filesystems/httm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 2f7f0c64d8fd..e85eb7c348d5 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.10.12"; + version = "0.10.15"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "Q69XltTdJgRLCwjt+oLSUWexO3MGd2HB11dN/edRGes="; + sha256 = "u18dIw4At78OSeWCDHJIjzDbaxpiSs3g+bf2WClFkuY="; }; - cargoSha256 = "2nQE/5SPAaih4TunHgZHcYKPoAaA+4KDLxxcK0RLUgw="; + cargoSha256 = "mLFponkRIEWePpSyhQK1IG/rnJ0qpDwrS7vwAoP1ro0="; nativeBuildInputs = [ installShellFiles ]; From 79772f20c52d66c310d60cc16770e998c3f04c8f Mon Sep 17 00:00:00 2001 From: Brian Ryall Date: Sun, 15 May 2022 10:49:18 -0400 Subject: [PATCH 26/99] beancount-language-server: refactor -> 1.1.1 --- .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 571 +++++------------- .../beancount-language-server/default.nix | 31 + pkgs/top-level/all-packages.nix | 2 + 4 files changed, 192 insertions(+), 413 deletions(-) create mode 100644 pkgs/development/tools/beancount-language-server/default.nix 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/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c8f5d232fc7..d37477e19861 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31334,6 +31334,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; From 477c85f46a91f4dc191ec488f337b2200d8f1d49 Mon Sep 17 00:00:00 2001 From: devhell Date: Tue, 31 May 2022 14:09:22 +0100 Subject: [PATCH 27/99] gurk-rs: 0.2.3 -> 0.2.4 --- .../networking/instant-messengers/gurk-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index 46d513a37fef..924a918ebceb 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "gurk-rs"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "boxdot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Mko5udM8BY50uUwn7xESxB+s0MEO1kAJX4Dt/DnEEa4="; + sha256 = "sha256-WZUoUvu7GaiBOaRAOGRCXrLe6u3DRbI6CDTAf5jryGc="; }; - cargoHash = "sha256-pYMMgBvLsqkj2peouDQK1vn97ByUjtdCrkbzuZZLXrY="; + cargoHash = "sha256-81ZW61JX40W0D/cmYogR3RJH2dvEKW1K7sIsl2io/7E="; buildInputs = [ protobuf ]; PROTOC = "${protobuf}/bin/protoc"; From e0903ce6aaea2fa1f783ed658f37c2e106b47510 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 31 May 2022 15:55:53 +0200 Subject: [PATCH 28/99] gnome-obfuscate: 0.0.4 -> 0.0.7 --- pkgs/applications/graphics/gnome-obfuscate/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 8cb4208e2672..1fca4d2004e2 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -8,7 +8,7 @@ , pkg-config , python3 , rustPlatform -, wrapGAppsHook +, wrapGAppsHook4 , appstream-glib , desktop-file-utils @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "gnome-obfuscate"; - version = "0.0.4"; + version = "0.0.7"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Obfuscate"; rev = version; - sha256 = "sha256-P8Y2Eizn1BMZXuFjGMXF/3oAUzI8ZNTrnbLyU+V6uk4="; + sha256 = "sha256-jEMOg2yHi6K57XhA/7hkwwvedmikoB8pGV3ka+jixq8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-5MzWz5NH2sViIfaP8xOQLreEal5TYkji11VaUgieT3U="; + sha256 = "sha256-P04BeidLXouPLzT/vsa4VC5AOENF0W4gqXqzdmRFhmE="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ From e87f16b25d3e3792f1f58ab491360c2666399728 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 May 2022 15:28:36 +0000 Subject: [PATCH 29/99] python310Packages.sphinxcontrib-spelling: 7.4.1 -> 7.5.0 --- .../python-modules/sphinxcontrib-spelling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 80f988c477a8..0b5e64fb3800 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "7.4.1"; + version = "7.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OpbyKqxq9JQHOvrLmI2U2NfCtgJ7IFA6jyDa4ysQw74="; + hash = "sha256-2SvcHWPzYbbgoXG51oUYEBdFSFMX8VhhUB44fxt49qs="; }; nativeBuildInputs = [ From f27643567c520c641f42238c98fc52dc4ec15fd3 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 31 May 2022 11:06:04 -0600 Subject: [PATCH 30/99] python3Packages.fpylll: unmark as broken on darwin --- pkgs/development/python-modules/fpylll/default.nix | 1 - 1 file changed, 1 deletion(-) 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"; From f97096fb47cf17cf7831d023dd575a55d0814fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Tue, 31 May 2022 20:00:07 +0100 Subject: [PATCH 31/99] ledger-live-desktop: 2.41.3 -> 2.42.0 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 84f6df6350f6..4d9edc5ea45b 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.41.3"; + version = "2.42.0"; name = "${pname}-${version}"; 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 { From 21dc93570f72f741ba6541837ac775441219e5c2 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Tue, 31 May 2022 18:45:07 +0300 Subject: [PATCH 32/99] python3Packages.awscrt: fix darwin build --- pkgs/development/python-modules/awscrt/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 1762fee0d7ba..2ffb2a9060b9 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { "strictoverflow" ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "extra_link_args += ['-Wl,-fatal_warnings']" "" + ''; + # gcc <10 is not supported, LLVM on darwin is just fine nativeBuildInputs = [ cmake @@ -52,7 +57,6 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://github.com/awslabs/aws-crt-python"; description = "Python bindings for the AWS Common Runtime"; license = licenses.asl20; From 170c8930faa83661f3335cc0a94c29b31943e9c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 May 2022 20:25:34 +0000 Subject: [PATCH 33/99] python310Packages.google-nest-sdm: 1.9.0 -> 2.0.0 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 = [ From 1ceab62a9c2557b99162b432388b006a63a67cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 31 May 2022 22:51:38 +0200 Subject: [PATCH 34/99] gmailctl: 0.10.3 -> 0.10.4 --- pkgs/applications/networking/gmailctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 80b8cd91adf15979f9770615e2713f3182c4bbf9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:21:43 +0200 Subject: [PATCH 35/99] python3Packages.archinfo: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 78bdce887407..348a022d2ccf 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-U++Ly+UwY2CiyKdHpPWRpURqxVv4dgVylZD7ERVzUCA="; + hash = "sha256-yMUcuZ9v1dVbh/t456fpMu8tDFWIdh55LZh7FLkz9GM="; }; checkInputs = [ From 426446b1dd716913993398ffb895ce369bad257c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:21:50 +0200 Subject: [PATCH 36/99] python3Packages.ailment: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 2bc2d1b63bcb..01617f7980ef 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-eETl1AMDdY55okPUVDv7L2zZMtDfA4dRi11z37xAM58="; + hash = "sha256-SymOCHKIr0SOi4OM+OONA7+A2nV4JMA467OkoqDhZ+M="; }; propagatedBuildInputs = [ From 9bb7b7f9e3a4ce26aa4bb649f19ecdc75b567db9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:22:04 +0200 Subject: [PATCH 37/99] python3Packages.pyvex: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 629fa6c5025b..b7bff273b231 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zQbIhl5MW/RYXV5EgL2Q7eKEwHNXVe+p6LPmIDbokwc="; + hash = "sha256-I2ZQJ/CDvNq5uJoLT9SHDGzeuI32YUy/6fMSNR9WM8I="; }; propagatedBuildInputs = [ From ed0de8992c68ff4f8086965ed5c7c9b007e88aaa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:22:10 +0200 Subject: [PATCH 38/99] python3Packages.claripy: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 8f2944c2d369..7dccab0b7624 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-o5aNHYysIpccWhf09xuJ1WT2Hac4OPyztnKqPne1Vng="; + hash = "sha256-mBpAwKUclwvgOeGD6BvPUKZHdjngfvuHdtKY3nx7jzM="; }; propagatedBuildInputs = [ From ffe661e61633a1123afdf8e236ef98f09b3742d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:22:18 +0200 Subject: [PATCH 39/99] python3Packages.cle: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index f2de74c1cf37..25765fc11d3d 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.5"; + version = "9.2.6"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-tBiabSbi4LKXA1Ou7MURRG2eGq1m1TutaHba+hq6DhQ="; + hash = "sha256-GOrjT5CM+yzboOTgkVriuf1UpNDVhDgGpS8vp4D39W0="; }; propagatedBuildInputs = [ From d94e58057750f31e1c48ab919c3121964b3b98c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:22:26 +0200 Subject: [PATCH 40/99] python3Packages.angr: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index ca15c795a4a7..a6a5aa49953f 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-uXH/7Qfs4VxG53819TG/Y2M0taIcE4uC06rdfBe22O0="; + hash = "sha256-qXzkrfF8FkALkEaFLSmaadovwLc2DkXXJivdrT6srTc="; }; propagatedBuildInputs = [ From 4745d032d675bd8ce5dea9e39f62be7b6f5cda7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:22:32 +0200 Subject: [PATCH 41/99] python3Packages.angrop: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index d7ea31a0bcfa..63dce4bdbed7 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-APm7+V0eLvgnPRzojQsfDPleEfrIssbgeUh5eugKiLM="; + hash = "sha256-qaDAicmYZxLPTl17il61ij01prRv2H4xxe07Xg4KWhI="; }; propagatedBuildInputs = [ From a571caaf73953f13bcee834b778d2fd5d001bc12 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Tue, 31 May 2022 23:47:34 +0200 Subject: [PATCH 42/99] duplicity: use pydrive2 to fix gdrive backup problems pydrive is abandoned and has unfixed issues. In particular, Deja Dup backups (which uses duplicity as backend) to Google Drive fail with Giving up after 5 attempts. RedirectMissingLocation: Redirected but the response is missing a Location: header. More context and pointers are available in the Deja Dup bug tracker: https://gitlab.gnome.org/World/deja-dup/-/issues/202#note_1306216 --- pkgs/tools/backup/duplicity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 268d1c282681496906d1619c730e1cd6084b4ac2 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 31 May 2022 16:30:00 -0600 Subject: [PATCH 43/99] pari: mark as broken on aarch64-darwin --- pkgs/applications/science/math/pari/default.nix | 1 + 1 file changed, 1 insertion(+) 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"; }; } From 21443080ad69b4d0b43258abf235bd332ebd4141 Mon Sep 17 00:00:00 2001 From: StephenWithPH Date: Tue, 31 May 2022 18:32:45 -0700 Subject: [PATCH 44/99] GNUcash: 4.9 -> 4.10 (#172445) * GNUcash: 4.9 -> 4.10 --- pkgs/applications/office/gnucash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index a9d532a27c24..a9effc7c3eba 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.9"; + version = "4.10"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-mlUcMMG3EhmfwiJ6EJr7mE177xjhOBcLvHIlxsH6ty0="; + hash = "sha256-f9S7kZ9uOTiKtHv6Ea9vo/Wem5vWlcfU6SCK+Fy5yTs="; }; nativeBuildInputs = [ From 21c2e9d069e22da92c4f1e144eeb763131aacdd3 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 1 Jun 2022 10:24:15 +0800 Subject: [PATCH 45/99] gnustep.base: Remove duplicated giflib input --- pkgs/desktops/gnustep/base/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 2c28b3a0bb60..7c6127a830b4 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -25,7 +25,7 @@ gsmakeDerivation rec { cups gmp gnutls libffi binutils-unwrapped - libjpeg libtiff libpng giflib giflib + libjpeg libtiff libpng giflib libxml2 libxslt libiconv libobjc libgcrypt icu From fca4f1a5116a55b3f6ac95c6cfb888d3edd1aa83 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 31 May 2022 19:40:58 -0700 Subject: [PATCH 46/99] localtime: unstable-2021-11-23 -> 2022-02-20 --- pkgs/tools/system/localtime/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index 943651fa2497..b1f05cb18519 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "localtime"; - version = "unstable-2021-11-23"; + version = "unstable-2022-02-20"; src = fetchFromGitHub { owner = "Stebalien"; repo = "localtime"; - rev = "3e5d6cd64444b2164e87cea03448bfb8eefd6ccd"; - sha256 = "sha256-6uxxPq6abtRqM/R2Fw46ynP9PEkHggTSUymLYlQXQRU="; + rev = "c1e10aa4141ed2bb01986b48e0e942e618993c06"; + hash = "sha256-bPQ1c2KUTkxx2g7IvLmrKgJKfRHTLlTXLR/QQ0O4CrI="; }; - vendorSha256 = "sha256-sf3sL6aO5jSytT2NtBkA3lhg77RIzbYkSC4fkH+cwwk="; + vendorSha256 = "sha256-12JnEU41sp9qRP07p502EYogveE+aNdfmLwlDRbIdxU="; postPatch = '' demoPath="${geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent" From b22c2113df12d785e784a131baf944d4f9cf4784 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 28 May 2022 22:28:03 -0700 Subject: [PATCH 47/99] kitty: 0.25.0 -> 0.25.1 --- .../terminal-emulators/kitty/default.nix | 45 +++++++++++++------ ...sable-test_ssh_login_shell_detection.patch | 13 ------ .../tarball-restore-write-permissions.patch | 27 ----------- 3 files changed, 32 insertions(+), 53 deletions(-) delete mode 100644 pkgs/applications/terminal-emulators/kitty/disable-test_ssh_login_shell_detection.patch delete mode 100644 pkgs/applications/terminal-emulators/kitty/tarball-restore-write-permissions.patch 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 From b35ad0da36974e073e4c1c38bcf96a4f63b1f892 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Jun 2022 13:26:51 +1000 Subject: [PATCH 48/99] cri-o: 1.23.2 -> 1.24.0 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index b6d238d599ee..0267a52a61e5 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.23.2"; + version = "1.24.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U="; + sha256 = "sha256-LbLBG8nvEgSF5KAeAYnp7dM9cbqF078QpVai1iDx63U="; }; vendorSha256 = null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7345955e993d..99b7247f3fcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31345,7 +31345,7 @@ with pkgs; bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; - cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; + cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { buildGoModule = buildGo118Module; }; confd = callPackage ../tools/system/confd { }; From affd0fc3e4b3f37c389864d949f8a924f02ec495 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 28 May 2022 13:23:07 +0200 Subject: [PATCH 49/99] python3Packages.pywlroots: 0.15.14 -> 0.15.15 --- pkgs/development/python-modules/pywlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 410e52372652..f9fdcd9e7c79 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.14"; + version = "0.15.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "z0PVjVzmAb5cgBdXWMxOdsy0VMMkmewHZaPNBYivXSA="; + sha256 = "Xg1Bd9Q6XV/+vuJH9Huiq2+igdAE/RS8yTvLeJz1l34="; }; nativeBuildInputs = [ pkg-config ]; From fa36f93646bd7acc2192caa012503fe2f9047033 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 04:06:47 +0000 Subject: [PATCH 50/99] python310Packages.onvif-zeep-async: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/onvif-zeep-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix index 5e9a86acc6bd..d895504186cb 100644 --- a/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "onvif-zeep-async"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O4H6oL9cFvgX6whoESA7eRI6+VoT1ncRk/tehQT1WcM="; + hash = "sha256-bRPqbuBrC4Q0gdQGb2KAy1pTHce42WvM7gjvAspH4WE="; }; propagatedBuildInputs = [ From 980aa59726c78343645a5da48e1cb6b158c17bb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 04:17:28 +0000 Subject: [PATCH 51/99] python310Packages.pycfmodel: 0.20.0 -> 0.20.1 --- pkgs/development/python-modules/pycfmodel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index 87f3798410a8..a6d991becbbc 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.20.0"; + version = "0.20.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-c6RbglmG/A1fVOLmJLRsyMy9EgEIzpXnIe9Co/OLMSg="; + hash = "sha256-syEE03lcOt6tTD88+BJ8nHCkamKn+BX/rZU9TOsxATc="; }; propagatedBuildInputs = [ From d4964be44cb430760b266f5df34a185f2920e80e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 31 May 2022 18:57:03 -0400 Subject: [PATCH 52/99] ledger: fix Python 3.10 module build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current default boost (1.77) doesn’t work with Python 3.10, so use 1.79 instead. --- pkgs/applications/office/ledger/default.nix | 1 - pkgs/top-level/python-packages.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 52e756f5b645..d4b4bde7b10b 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "https://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; license = licenses.bsd3; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a4c23948277d..0965a6193d96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4769,6 +4769,7 @@ in { ledger = (toPythonModule (pkgs.ledger.override { usePython = true; + boost = pkgs.boost179; # Current default boost (1.77) doesn’t work with Python 3.10. python3 = python; })).py; From 0badd351d138763d48425e2d2efa07b8481408e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 04:33:59 +0000 Subject: [PATCH 53/99] python310Packages.peaqevcore: 0.1.4 -> 0.2.0 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 9049d7b53925..6f89cd615743 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "0.1.4"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+L730I30dN+d6oc5HWq578B0Io5j5CjAy3SuIGGjOR8="; + hash = "sha256-M7jBwpo9yMggd81xiWH9SSJ1axGXiC5uQo/jnRcQ3/4="; }; postPatch = '' From da7dfd94c008dd40ca09bdddca60edf19911f85a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 04:53:33 +0000 Subject: [PATCH 54/99] python310Packages.hahomematic: 1.6.2 -> 1.7.0 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index e38f98bcad1a..1f1c0ec7a8af 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.6.2"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-x7TaSpmNd0YUgh81Favpo6qZgRsVeIyvvFfH3UCCqsQ="; + sha256 = "sha256-Gu1yMLGkXmARNPX1Erjj1Py4APYAlQ4SI4PyG0QbYeY="; }; propagatedBuildInputs = [ From ee33bd5a79d0f1bb1baff6dc51d199490f1ad5a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 04:58:43 +0000 Subject: [PATCH 55/99] python310Packages.pex: 2.1.91 -> 2.1.92 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index ac45f9eb07ed..307e0e411a00 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.91"; + version = "2.1.92"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nlEdCdFxF/maOZtpUwNVExnmqUhdAfzlbrEMxAHvUxE="; + hash = "sha256-LEHbS6rSKQl1APWYjNS8y1edtXDRqSuhfftcuM67K44="; }; nativeBuildInputs = [ From a358aad21a192ce993f4d91f3a8af7f4edf30d11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 05:21:05 +0000 Subject: [PATCH 56/99] python310Packages.pyoverkiz: 1.4.0 -> 1.4.1 --- pkgs/development/python-modules/pyoverkiz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 019a7682a7ef..6f09f2d6d989 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.4.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iMicknl"; repo = "python-overkiz-api"; - rev = "v${version}"; - hash = "sha256-uaeSyRtnokUJ3jWTioVMuo+T3jFoH+SYTBT3HPCPjm8="; + rev = "refs/tags/v${version}"; + hash = "sha256-PVRNfpV6LwZNzSQaDJnDztNUdzosa2yIdXRLXpPMVW4="; }; nativeBuildInputs = [ From 5feacad6948061f30853107421827d3a2f1ebd06 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 31 May 2022 12:17:46 -0300 Subject: [PATCH 57/99] ocamlPackages.tsdl: 0.9.7 -> 0.9.8 --- pkgs/development/ocaml-modules/tsdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 44cc2076fbb4..1b248dd18603 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -6,7 +6,7 @@ else let pname = "tsdl"; - version = "0.9.7"; + version = "0.9.8"; webpage = "https://erratique.ch/software/${pname}"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f"; + sha256 = "sha256-zjXz2++42FHmbE0nIDeryNQeX+avGwh9rwAs8O0pZYU="; }; nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; From b161742e8667b4c131bd04952061d1d22a57566f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 31 May 2022 14:26:46 -0300 Subject: [PATCH 58/99] ocamlPackages.tsdl-image: init 0.3.2 --- .../ocaml-modules/tsdl-image/default.nix | 37 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/ocaml-modules/tsdl-image/default.nix diff --git a/pkgs/development/ocaml-modules/tsdl-image/default.nix b/pkgs/development/ocaml-modules/tsdl-image/default.nix new file mode 100644 index 000000000000..a8a2e2d38d62 --- /dev/null +++ b/pkgs/development/ocaml-modules/tsdl-image/default.nix @@ -0,0 +1,37 @@ +{ buildDunePackage +, dune-configurator +, fetchFromGitHub +, lib +, SDL2 +, SDL2_image +, tsdl +}: + +buildDunePackage rec { + pname = "tsdl-image"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "sanette"; + repo = pname; + rev = version; + sha256 = "sha256-u6VYAwq+2oLn2Kw1+KQRVPswAqeKDSAaPfGLPrzn30s="; + }; + + buildInputs = [ + dune-configurator + ]; + + propagatedBuildInputs = [ + SDL2 + SDL2_image + tsdl + ]; + + meta = with lib; { + description = "OCaml SDL2_image bindings to go with Tsdl"; + homepage = "https://github.com/sanette/tsdl-image"; + license = licenses.bsd3; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 53ede51c4ccf..70f235bfae83 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1367,6 +1367,8 @@ let tsdl = callPackage ../development/ocaml-modules/tsdl { }; + tsdl-image = callPackage ../development/ocaml-modules/tsdl-image { }; + twt = callPackage ../development/ocaml-modules/twt { }; uchar = callPackage ../development/ocaml-modules/uchar { }; From 174d0fbddaaa997c15cde4164599b51c457d3199 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 31 May 2022 15:55:12 -0300 Subject: [PATCH 59/99] ocamlPackages.tsdl-ttf: init 0.3.2 --- .../ocaml-modules/tsdl-ttf/default.nix | 37 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/ocaml-modules/tsdl-ttf/default.nix diff --git a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix new file mode 100644 index 000000000000..c8445bf4337c --- /dev/null +++ b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix @@ -0,0 +1,37 @@ +{ buildDunePackage +, dune-configurator +, fetchFromGitHub +, lib +, SDL2 +, SDL2_ttf +, tsdl +}: + +buildDunePackage rec { + pname = "tsdl-ttf"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "sanette"; + repo = pname; + rev = version; + sha256 = "sha256-COBLF9K8thRROJJGeg4wxqrjB3aBa4CGYkf8HdAQ2o0"; + }; + + buildInputs = [ + dune-configurator + ]; + + propagatedBuildInputs = [ + SDL2 + SDL2_ttf + tsdl + ]; + + meta = with lib; { + description = "SDL2_ttf bindings for Ocaml with Tsdl"; + homepage = "https://github.com/sanette/tsdl-ttf"; + license = licenses.bsd3; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 70f235bfae83..2535d0f92460 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1369,6 +1369,8 @@ let tsdl-image = callPackage ../development/ocaml-modules/tsdl-image { }; + tsdl-ttf = callPackage ../development/ocaml-modules/tsdl-ttf { }; + twt = callPackage ../development/ocaml-modules/twt { }; uchar = callPackage ../development/ocaml-modules/uchar { }; From 13785fcc8fe1fa281979c3e378ae3923bb3170e6 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 31 May 2022 16:06:44 -0300 Subject: [PATCH 60/99] ocamlPackages.tsdl-mixer: init 0.3.2 --- .../ocaml-modules/tsdl-mixer/default.nix | 37 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/ocaml-modules/tsdl-mixer/default.nix diff --git a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix new file mode 100644 index 000000000000..4a59025f9d88 --- /dev/null +++ b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix @@ -0,0 +1,37 @@ +{ buildDunePackage +, dune-configurator +, fetchFromGitHub +, lib +, SDL2 +, SDL2_mixer +, tsdl +}: + +buildDunePackage rec { + pname = "tsdl-mixer"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "sanette"; + repo = pname; + rev = version; + sha256 = "sha256-UDRhwnanrn87/PYVnacur1z/LsKuUu2G+0QQXjTw/IE="; + }; + + buildInputs = [ + dune-configurator + ]; + + propagatedBuildInputs = [ + SDL2 + SDL2_mixer + tsdl + ]; + + meta = with lib; { + description = "SDL2_mixer bindings to go with Tsdl"; + homepage = "https://github.com/sanette/tsdl-mixer"; + license = licenses.bsd3; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2535d0f92460..3119d138dfd1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1369,6 +1369,8 @@ let tsdl-image = callPackage ../development/ocaml-modules/tsdl-image { }; + tsdl-mixer = callPackage ../development/ocaml-modules/tsdl-mixer { }; + tsdl-ttf = callPackage ../development/ocaml-modules/tsdl-ttf { }; twt = callPackage ../development/ocaml-modules/twt { }; From e3151f9b1978846bf0b7fd0421e192dbfcb76121 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 06:01:32 +0000 Subject: [PATCH 61/99] python310Packages.mypy-boto3-s3: 1.23.0.post1 -> 1.24.0 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 987aa20d2dbb..cb37545aa449 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.23.0.post1"; + version = "1.24.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-eF0ChMOqisXsMWLlKCAWGMrTUe4sGfZxWo5uc/ZKAQk="; + hash = "sha256-ITZItcLZ/Im/tWptkKXGc+H1lT4m1mIlljTP/w+6pNo="; }; propagatedBuildInputs = [ From 1db266dd5d65cd4f179e6b53e813100c044cb53e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 06:23:57 +0000 Subject: [PATCH 62/99] python310Packages.scmrepo: 0.0.22 -> 0.0.23 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index cfb84743ff3a..984491be9be9 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.0.22"; + version = "0.0.23"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hV0BusvuJUEGfmue7OHR3YYmpBcFTgbQE7UuHmTUBo0="; + hash = "sha256-Yg08twcxXKtDlkOxmD5eafeaeij4zX/3XQQQN948xxs="; }; propagatedBuildInputs = [ From d887e5666b45f7fd895db055ce8006636f37ed03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 06:54:59 +0000 Subject: [PATCH 63/99] python310Packages.plaid-python: 9.4.0 -> 9.5.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 3b68fef41727..20613e518af8 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.4.0"; + version = "9.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Md4vzAirCm5fjcTAeiLIQwH0MAP47r2AT8O5yigGqv8="; + hash = "sha256-gjYlr2rp2xRMcFKbA4Y/Pb7YYOUR4LTzMtVoG1iMlx0="; }; propagatedBuildInputs = [ From 583a2312e44b658ac86cba2cd94f4c2014392716 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 31 May 2022 23:39:41 -0700 Subject: [PATCH 64/99] cvc4: fix build on darwin Dependency on cln is optional --- pkgs/applications/science/logic/cvc4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index b0b3e5e610e6..873c3ca57c0c 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ gmp git python3.pkgs.toml cln readline swig libantlr3c antlr3_4 boost jdk python3 ]; + buildInputs = [ gmp git python3.pkgs.toml readline swig libantlr3c antlr3_4 boost jdk python3 ] + ++ lib.optionals (!stdenv.isDarwin) [ cln ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" - "--with-cln" "--with-readline" "--with-boost=${boost.dev}" - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ "--with-cln" ]; prePatch = '' patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat From 239087c990f6da4ebe1801825fe7b9e714f73ae5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Jun 2022 14:44:48 +1000 Subject: [PATCH 65/99] kubernetes: 1.23.5 -> 1.23.7 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e4203f0028ad..deb95b695d2b 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.23.5"; + version = "1.23.7"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-LhJ3gThcsWnawSOmHSzWOG8tfODIPo4dJTMeLKmvMdM="; + sha256 = "sha256-YHlcopB47HVLO/4QI8HxjMBzCpcHVnlAz3EOmZI+EG8="; }; nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; From c8367fb9d44233e5e9bcbb8bc2f41cec4785e7db Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 12 Mar 2022 16:20:06 -0800 Subject: [PATCH 66/99] koka: 2.3.8 -> 2.4.0 --- pkgs/development/compilers/koka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 031aac03eccd..901830ffb70e 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -4,12 +4,12 @@ , parsec, process, regex-compat, text, time }: let - version = "2.3.8"; + version = "2.4.0"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-4a9UwtiWq9eFpNHpcrlhYUwzXcr1EXFMjBmDFYP933U="; + sha256 = "sha256-+evs5g0qrplUMr8zC51GvUx2JXQBYJb39IaI4rC6CSA="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { From 7b3aa7abd6c648ee58bbac9ac955d4e8ebdf4ef5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 08:28:14 +0000 Subject: [PATCH 67/99] python310Packages.sdds: 0.2.1 -> 0.3.0 --- pkgs/development/python-modules/sdds/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix index 3003dddce6de..6970bcad4096 100644 --- a/pkgs/development/python-modules/sdds/default.nix +++ b/pkgs/development/python-modules/sdds/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sdds"; - version = "0.2.1"; + version = "0.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pylhc"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-JcxcF0tDigZz3upzE7rPDynCH45dnLk/zpS0a2dOwRU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-l9j+YJ5VNMzL6JW59kq0hQS7XIj53UxW5bNnfdURz/o="; }; propagatedBuildInputs = [ numpy ]; From ddd16ea9f1d7d39436c33f37373c02292db39fc6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Jun 2022 10:42:34 +0200 Subject: [PATCH 68/99] antlr4_9: 4.9.2 -> 4.9.3 --- pkgs/development/tools/parsing/antlr/4.9.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) 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; From b2a5cf63907fa10aac1f9fc8c757f46ce0185bf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 10:52:51 +0200 Subject: [PATCH 69/99] python310Packages.zha-quirks: 0.0.74 -> 0.0.75 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index cb667e48518e..c4398ff19cb5 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.74"; + version = "0.0.75"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-W1EToFt+jZ21jEdQZomKB5Co25mcuf/QMJMs1c2kacY="; + hash = "sha256-iwNXyoA85NcgrxqAPydTA3FAW+weE2pdPyijEV4PbSA="; }; propagatedBuildInputs = [ From fd30fff77376c3bb252d1e356e3d44d5fd2138b7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Jun 2022 10:56:23 +0200 Subject: [PATCH 70/99] python3Packages.tqdm: 4.63.1 -> 4.64.0 Only additions, no changes: https://github.com/tqdm/tqdm/releases/tag/v4.64.0 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 2cdbcc203a16a245cc12ed24719650ffebcb1f9c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Jun 2022 10:43:58 +0200 Subject: [PATCH 71/99] python3Packages.afdko: 3.8.1 -> 3.8.3 https://github.com/adobe-type-tools/afdko/blob/3.8.3/NEWS.md#383-released-2022-05-09 --- pkgs/development/python-modules/afdko/default.nix | 4 ++-- .../afdko/use-dynamic-system-antlr4-runtime.patch | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) 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}) From 4627a9fd26f6f8ef222f5128f2562df9b67b647b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 09:08:23 +0000 Subject: [PATCH 72/99] p2pool: 2.0 -> 2.1 --- pkgs/applications/misc/p2pool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; }; From 7f05522604a6e5e23a1ed05243b71c9e149c76f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 May 2022 16:44:49 +0200 Subject: [PATCH 73/99] python310Packages.dask-mpi: disable on older Python releases --- .../python-modules/dask-mpi/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) 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 ]; }; } From 3773e35a21f55c7c97e5a44ff7f65ed899d9e3ad Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 1 Jun 2022 10:25:14 +0100 Subject: [PATCH 74/99] netdata: do not persist ./configure flags to decrease closure size Before: $ nix path-info -r ./result | wc -l 76 $ nix path-info -Sh ./result ...-netdata-1.34.1 366.8M After: $ nix path-info -r ./result | wc -l 30 $ nix path-info -Sh ./result ...-netdata-1.34.1 205.7M --- pkgs/tools/system/netdata/default.nix | 4 ++++ .../system/netdata/skip-CONFIGURE_COMMAND.patch | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index b194b2f2a4b2..dd50e48f0735 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -49,6 +49,10 @@ in stdenv.mkDerivation rec { # Therefore we put it into `/run/netdata`, which is owned # by netdata only. ./ipc-socket-in-run.patch + + # Avoid build-only inputs in closure leaked by configure command: + # https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162 + ./skip-CONFIGURE_COMMAND.patch ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; diff --git a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch new file mode 100644 index 000000000000..fa7a0e7ad9c2 --- /dev/null +++ b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch @@ -0,0 +1,16 @@ +Shrink closure size by avoiding paths embedded from configure call. + +https://github.com/NixOS/nixpkgs/issues/175693 +--- a/daemon/buildinfo.c ++++ b/daemon/buildinfo.c +@@ -248,7 +248,9 @@ void print_build_info(void) { + char *prebuilt_distro = NULL; + get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro); + +- printf("Configure options: %s\n", CONFIGURE_COMMAND); ++ // To minimize closure size do not persist configure options ++ // with build-time inputs. ++ printf("Configure options: REMOVED\n"); + + if (install_type == NULL) { + printf("Install type: unknown\n"); From 0fce602773c28f5e9532c1dde588304fc630c0a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 04:04:06 +0000 Subject: [PATCH 75/99] gnome.gnome-settings-daemon: 42.1 -> 42.2 --- pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 03698f865d65..7e236dc39fd1 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "42.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "7WWFGuVK3NWKJMhoN9Yk/GoUvYSrIulN9Ao6TP0Z/9s="; + sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA="; }; patches = [ From ff24f484afbbde86aef3f8850034e3e42977db32 Mon Sep 17 00:00:00 2001 From: Matthias Treydte Date: Tue, 31 May 2022 16:42:33 +0200 Subject: [PATCH 76/99] nixos/systemd-boot: fix systemd-boot-builder refusing to update Handling of the string length condition in should_update was broken, as evident with the log message > leaving systemd-boot 246 in place (250.4 is not newer) Discussion with @mweinelt came to the conclusion that Python's "<" operator already does what we need, so the should_update function can be dropped. Fixes a30de3b849bb29b4d2206e1a652707fba8ea18a4 --- .../loader/systemd-boot/systemd-boot-builder.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 4bb39811434c..aca6a1ca2cc2 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -204,21 +204,6 @@ def get_profiles() -> List[str]: else: return [] -def should_update(v_from: str, v_to: str) -> bool: - # see https://github.com/systemd/systemd/blob/main/src/boot/bootctl.c compare_product function - - len_from = len(v_from) - len_to = len(v_to) - - if len_from < len_to: - return False - - if len_from > len_to: - return True - - return v_from < v_to - - def main() -> None: parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files') parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot') @@ -276,7 +261,7 @@ def main() -> None: installed_version = installed_match.group(1) available_version = available_match.group(1) - if should_update(installed_version, available_version): + if installed_version < available_version: print("updating systemd-boot from %s to %s" % (installed_version, available_version)) subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"]) else: From f0d4c085acea890328c79bd5b66a630616ca9c83 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 1 Jun 2022 09:51:32 +0000 Subject: [PATCH 77/99] kexpand: remove --- pkgs/development/tools/kexpand/default.nix | 17 ----------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/development/tools/kexpand/default.nix diff --git a/pkgs/development/tools/kexpand/default.nix b/pkgs/development/tools/kexpand/default.nix deleted file mode 100644 index 35d0a5c2da07..000000000000 --- a/pkgs/development/tools/kexpand/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ buildGoPackage, fetchFromGitHub }: - -buildGoPackage { - pname = "kexpand"; - version = "unstable-2017-05-12"; - - goPackagePath = "github.com/kopeio/kexpand"; - - subPackages = [ "." ]; - - src = fetchFromGitHub { - owner = "kopeio"; - repo = "kexpand"; - rev = "c508a43a4e84410dfd30827603e902148c5c1f3c"; - sha256 = "0946h74lsqnr1106j7i2w2a5jg2bbk831d7prlws4bb2kigfm38p"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6c8fed798936..b51a766d9a17 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -635,6 +635,7 @@ mapAliases ({ keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01 kerberos = libkrb5; # moved from top-level 2021-03-14 kexectools = kexec-tools; # Added 2021-09-03 + kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01 keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14 kgx = gnome-console; # Added 2022-02-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f8e42774535..4a477bce14f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7436,8 +7436,6 @@ with pkgs; keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; - kexpand = callPackage ../development/tools/kexpand { }; - kent = callPackage ../applications/science/biology/kent { }; keybase = callPackage ../tools/security/keybase { From 213fce357f4a5fbd8b710d3ef9e8014e5ee71fe0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 15:37:12 +0200 Subject: [PATCH 78/99] python310Packages.dask-jobqueue: disable on older Python releases --- .../python-modules/dask-jobqueue/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 ]; }; From b4f9f8b766bc6a07743239cf1f17dc0b05920fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Wed, 1 Jun 2022 11:18:23 +0100 Subject: [PATCH 79/99] ledger-live-desktop: rename name to pname+version --- .../blockchains/ledger-live-desktop/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 4d9edc5ea45b..c1b5c04e1fb0 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -3,7 +3,6 @@ let pname = "ledger-live-desktop"; version = "2.42.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; @@ -11,7 +10,7 @@ let }; 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 From 07ec6f9b96bf8a3ccc9da7e20c7565a04d1f4999 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 10:22:04 +0000 Subject: [PATCH 80/99] python310Packages.adafruit-platformdetect: 3.22.1 -> 3.23.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 921c844e27d8..eba672033eec 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.22.1"; + version = "3.23.0"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-fOBs0aPekIvpwbrYxzh1wz7EKGko0Je1f/N5H0DIguw="; + sha256 = "sha256-4OWDwvdQBtV+ZqpITr027z0jwfge5/yOof9Xm7QRtuM="; }; nativeBuildInputs = [ From 7eab23d517cfd3a2e8d40e0d72cdb8fb0969bf9a Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 31 May 2022 17:28:33 +0200 Subject: [PATCH 81/99] jellyfin: fix permissions on state directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, all configuration and state data was accessible to all users on the system running jellyfin. This included user passwords in the Jellyfin database, as well as credentials for LDAP if configured. The exact set of accessible data depends on system configuration. Thanks to Sofie Finnes Øvrelid for reporting this issue. Fixes: CVE-2022-32198 Co-Authored-By: Martin Weinelt --- nixos/modules/services/misc/jellyfin.nix | 3 +++ 1 file changed, 3 insertions(+) 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"; From 78d491457dcb1fac4bc34be03c25b5ef6bf7aca6 Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 1 Jun 2022 12:43:07 +0200 Subject: [PATCH 82/99] archi: remove myself from maintainers --- pkgs/tools/misc/archi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index e6f16b93f7d2..8d35ff717f5f 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://www.archimatetool.com/"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ earldouglas SuperSandro2000 ]; + maintainers = with maintainers; [ earldouglas ]; }; } From 11dd9db95575f30e00e5f671e90d5ac8efbfdd2f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 1 Jun 2022 10:05:40 +0000 Subject: [PATCH 83/99] grv: remove --- .../git-and-tools/grv/default.nix | 50 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/grv/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix deleted file mode 100644 index 7cfa5765df4c..000000000000 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline -, cmake }: -let - version = "0.3.2"; -in -buildGoPackage { - pname = "grv"; - inherit version; - - buildInputs = [ ncurses readline curl ]; - nativeBuildInputs = [ pkg-config cmake ]; - - goPackagePath = "github.com/rgburke/grv"; - - src = fetchFromGitHub { - owner = "rgburke"; - repo = "grv"; - rev = "v${version}"; - sha256 = "0bpjsk35rlp56z8149z890adnhmxyh743vsls3q86j4682b83kyf"; - fetchSubmodules = true; - }; - - postPatch = '' - rm util/update_latest_release.go - ''; - - postConfigure = '' - cd $NIX_BUILD_TOP/go/src/$goPackagePath - ''; - - buildPhase = '' - runHook preBuild - make build-only - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -D grv $out/bin/grv - runHook postInstall - ''; - - meta = with lib; { - description = "GRV is a terminal interface for viewing Git repositories"; - homepage = "https://github.com/rgburke/grv"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6c8fed798936..3f2d67df4eea 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -534,6 +534,7 @@ mapAliases ({ gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 + grv = "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01 gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22 gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f8e42774535..667135c8a76f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6693,8 +6693,6 @@ with pkgs; stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; } // (config.grub or {})); - grv = callPackage ../applications/version-management/git-and-tools/grv { }; - trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; From c82122512ac8c245ab0992c7965050cdf381d672 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 11:35:14 +0000 Subject: [PATCH 84/99] python310Packages.simplisafe-python: 2022.05.1 -> 2022.05.2 --- pkgs/development/python-modules/simplisafe-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 074218f22db30f2663a9213a9f01e665eca5eef9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 11:41:20 +0000 Subject: [PATCH 85/99] jc: 1.19.0 -> 1.20.0 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 2af0bc122ac4942aa4da34aeb6b2addef9574b64 Mon Sep 17 00:00:00 2001 From: MatthiasBenaets Date: Fri, 27 May 2022 17:02:57 +0200 Subject: [PATCH 86/99] maintainers: add matthiasbenaets --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6631421af6d2..85d767c06957 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7964,6 +7964,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"; From 8dcba104aa329870d34f4c9ae2735c8182bb2ade Mon Sep 17 00:00:00 2001 From: MatthiasBenaets Date: Fri, 27 May 2022 17:00:06 +0200 Subject: [PATCH 87/99] new-lg4ff: init at 0.3.3 --- nixos/modules/hardware/new-lg4ff.nix | 28 +++++++++++++++ nixos/modules/module-list.nix | 1 + pkgs/os-specific/linux/new-lg4ff/default.nix | 36 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 4 files changed, 69 insertions(+) create mode 100644 nixos/modules/hardware/new-lg4ff.nix create mode 100644 pkgs/os-specific/linux/new-lg4ff/default.nix 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 7ca90fc3ec34..d6cfe0c35645 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/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb47bea65e2e..7066c9b98c25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23057,6 +23057,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 { }; From 70b1bbd79995045d5cd04d0600988e8da16befbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sat, 28 May 2022 11:27:03 +0300 Subject: [PATCH 88/99] qt6Packages.quazip: init Co-authored-by: Sandro --- pkgs/development/libraries/quazip/default.nix | 3 ++- pkgs/top-level/qt6-packages.nix | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) 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/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 { }; }))) From 64d7afee219fa3543261fb15d636444b4cff64c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Jun 2022 06:27:36 -0700 Subject: [PATCH 89/99] oh-my-zsh: 2022-05-25 -> 2022-06-01 (#175713) --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 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; From c890f9ae89bd6a860ca2dbc68b016715f1ccf2eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 15:36:47 +0200 Subject: [PATCH 90/99] python310Packages.adafruit-platformdetect: disable on older Python releases --- .../python-modules/adafruit-platformdetect/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index eba672033eec..a976c3de1b02 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools-scm +, pythonOlder }: buildPythonPackage rec { @@ -9,10 +10,12 @@ buildPythonPackage rec { version = "3.23.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-4OWDwvdQBtV+ZqpITr027z0jwfge5/yOof9Xm7QRtuM="; + hash = "sha256-4OWDwvdQBtV+ZqpITr027z0jwfge5/yOof9Xm7QRtuM="; }; nativeBuildInputs = [ From 3a15f059278768e6920a27d1fd85a80f4917c693 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 15:42:07 +0200 Subject: [PATCH 91/99] python310Packages.sdds: disable on older Python releases --- .../python-modules/sdds/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix index 6970bcad4096..fa4493916410 100644 --- a/pkgs/development/python-modules/sdds/default.nix +++ b/pkgs/development/python-modules/sdds/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , numpy , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -10,20 +11,29 @@ buildPythonPackage rec { version = "0.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "pylhc"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-l9j+YJ5VNMzL6JW59kq0hQS7XIj53UxW5bNnfdURz/o="; + 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 ]; From 3e603ff1a8b87dc70af44b9461b38f05806039e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 15:46:40 +0200 Subject: [PATCH 92/99] python310Packages.crownstone-uart: 2.4.0 -> 2.4.1 --- pkgs/development/python-modules/crownstone-uart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From f9ac6bf0574d2dbe16ca121b4d1d6137bda2f590 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 15:48:06 +0200 Subject: [PATCH 93/99] python310Packages.hahomematic: 1.7.0 -> 1.7.2 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From a44571821a987f4666a02b0b129457ee4761b1b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 15:49:05 +0200 Subject: [PATCH 94/99] python310Packages.motionblinds: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/motionblinds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 3382990f8ec35086fd78053c354714a03d839554 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 15:55:46 +0200 Subject: [PATCH 95/99] python310Packages.pypoolstation: 0.4.2 -> 0.4.4 --- pkgs/development/python-modules/pypoolstation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 7c8ad2c9f4d6b1ad7bbb1b9b114ec5f5121c86ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 16:50:58 +0200 Subject: [PATCH 96/99] python310Packages.awesomeversion: 22.4.0 -> 22.5.2 (#170680) --- pkgs/development/python-modules/awesomeversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 21879444fa073037c5216c340a483545dff2a79a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Jun 2022 11:44:33 +0200 Subject: [PATCH 97/99] webkitgtk: 2.36.2 -> 2.36.3 https://webkitgtk.org/2022/05/28/webkitgtk2.36.3-released.html https://webkitgtk.org/security/WSA-2022-0005.html Fixes: CVE-2022-26700, CVE-2022-26709, CVE-2022-26717, CVE-2022-26716, CVE-2022-26719, CVE-2022-30293, CVE-2022-30294 --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 [ From 99d0d5f1dbb2d710858ea9303644a6a63592dea6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 May 2022 23:44:33 +0000 Subject: [PATCH 98/99] you-get: 0.4.1602 -> 0.4.1612 --- pkgs/tools/misc/you-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 90b29d80ac18..f5732847452a 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ 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. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RwbAbMS5CA6pO08TuaTb67YM/hLRkceOF7D6iV0XcI8="; + sha256 = "sha256-lKEztwwn1pnALuwDiA1Ik9+XCVyO+UMobv+hXu0mn5w="; }; nativeBuildInputs = [ installShellFiles ]; From 575b761b396d23574471d05b3d02b75b6f7dd2d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 1 Jun 2022 01:05:35 +0000 Subject: [PATCH 99/99] you-get: hardcode ffmpeg path --- pkgs/tools/misc/you-get/default.nix | 21 +++++++++++++++++---- pkgs/tools/misc/you-get/ffmpeg-path.patch | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/misc/you-get/ffmpeg-path.patch diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index f5732847452a..32d5b5712da8 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -1,6 +1,11 @@ -{ lib, buildPythonApplication, fetchPypi, installShellFiles }: +{ lib +, python3 +, substituteAll +, ffmpeg +, installShellFiles +}: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "you-get"; version = "0.4.1612"; @@ -8,11 +13,20 @@ buildPythonApplication rec { # probably aren't suitable for a build environment anyway. doCheck = false; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cad446e147fe..19165528cefc 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 {};