From bd99b3b8ff843f0859c27dea1cf7ad0cc9bc1753 Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Sat, 5 Nov 2022 19:52:42 -0400 Subject: [PATCH 01/49] nixos/plymouth: don't start Plymouth on config switch --- nixos/modules/system/boot/plymouth.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 9b6472fea429..a1ab70938575 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -146,6 +146,9 @@ in systemd.services.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ]; systemd.paths.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ]; + # Prevent Plymouth taking over the screen during system updates. + systemd.services.plymouth-start.restartIfChanged = false; + boot.initrd.systemd = { extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell storePaths = [ From ed0b8c26f127525a9ee66f895bdc894cdaa5d685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 10 Dec 2022 15:56:30 +0100 Subject: [PATCH 02/49] lib/strings: add `concatLines` Like `unlines` from Haskell. The aim is to replace the `concatStringsSep "\n"` pattern for generated files, which doesn't add a final newline. --- lib/default.nix | 2 +- lib/strings.nix | 11 +++++++++++ lib/tests/misc.nix | 5 +++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index 68e5b8dea1eb..48d066e17ccc 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -93,7 +93,7 @@ let subtractLists mutuallyExclusive groupBy groupBy'; inherit (self.strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep - concatImapStringsSep makeSearchPath makeSearchPathOutput + concatImapStringsSep concatLines makeSearchPath makeSearchPathOutput makeLibraryPath makeBinPath optionalString hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape escapeShellArg escapeShellArgs isValidPosixName toShellVar toShellVars diff --git a/lib/strings.nix b/lib/strings.nix index 9a4f29380d0d..32132e83b242 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -127,6 +127,17 @@ rec { # List of input strings list: concatStringsSep sep (lib.imap1 f list); + /* Concatenate a list of strings, adding a newline at the end of each one. + Defined as `concatMapStrings (s: s + "\n")`. + + Type: concatLines :: [string] -> string + + Example: + concatLines [ "foo" "bar" ] + => "foo\nbar\n" + */ + concatLines = concatMapStrings (s: s + "\n"); + /* Construct a Unix-style, colon-separated search path consisting of the given `subDir` appended to each of the given paths. diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 648c05ab3572..7cd6dd182f47 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -153,6 +153,11 @@ runTests { expected = "a,b,c"; }; + testConcatLines = { + expr = concatLines ["a" "b" "c"]; + expected = "a\nb\nc\n"; + }; + testSplitStringsSimple = { expr = strings.splitString "." "a.b.c.d"; expected = [ "a" "b" "c" "d" ]; From e6f973eeabff82c437c6adf8254227b073ffb5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 12 Dec 2022 22:54:33 +0100 Subject: [PATCH 03/49] matterbridge: only build main package --- pkgs/servers/matterbridge/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index b4e4e87fb7dc..11920c3e8b68 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -11,6 +11,8 @@ buildGoModule rec { sha256 = "sha256-VqVrAmbKTfDhcvgayEE1wUeFBSTGczBrntIJQ5/uWzM="; }; + subPackages = [ "." ]; + vendorSha256 = null; meta = with lib; { From 5c90ea3fa6841484fffde6c04d04461a69ae7582 Mon Sep 17 00:00:00 2001 From: Werner Buck Date: Wed, 28 Dec 2022 20:49:15 +0100 Subject: [PATCH 04/49] Add wayland support --- pkgs/applications/misc/todoist-electron/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index e7a693b4ca49..50e8a2ea10d8 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron_21}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ''; meta = with lib; { From ad9521e07e188572fb64f4941b8eb770c7a7e20c Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 2 Jan 2023 21:34:35 +0100 Subject: [PATCH 05/49] multipath-tools: 0.9.3 -> 0.9.4 https://github.com/opensvc/multipath-tools/compare/0.9.3...0.9.4 Fixed a bunch of issues and warnings occuring during the build. `passthru.tests` is however still broken. --- .../modules/services/networking/multipath.nix | 1 - .../linux/multipath-tools/default.nix | 21 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/networking/multipath.nix b/nixos/modules/services/networking/multipath.nix index 54ee2a015687..b20ec76ddf59 100644 --- a/nixos/modules/services/networking/multipath.nix +++ b/nixos/modules/services/networking/multipath.nix @@ -516,7 +516,6 @@ in { ${optionalString (!isNull defaults) '' defaults { ${indentLines 2 defaults} - multipath_dir ${cfg.package}/lib/multipath } ''} ${optionalString (!isNull blacklist) '' diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index d39da5fb9d7f..2509b6850514 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, coreutils , pkg-config , perl , lvm2 @@ -9,31 +10,28 @@ , systemd , liburcu , json_c -, kmod +, linuxHeaders , cmocka , nixosTests }: stdenv.mkDerivation rec { pname = "multipath-tools"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "opensvc"; repo = "multipath-tools"; rev = "refs/tags/${version}"; - sha256 = "sha256-pIGeZ+jB+6GqkfVN83axHIuY/BobQ+zs+tH+MkLIln0="; + sha256 = "sha256-CPvtnjzkyxKXrT8+YXaIgDA548h8X61+jCxMHKFfEyg="; }; postPatch = '' - substituteInPlace libmultipath/Makefile \ - --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h + substituteInPlace create-config.mk \ + --replace /bin/echo ${coreutils}/bin/echo - # systemd-udev-settle.service is deprecated. substituteInPlace multipathd/multipathd.service \ - --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ - --replace /sbin/multipathd "$out/bin/multipathd" \ - --replace " systemd-udev-settle.service" "" + --replace /sbin/multipathd "$out/bin/multipathd" sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", @@ -45,15 +43,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ systemd lvm2 libaio readline liburcu json_c ]; + buildInputs = [ systemd lvm2 libaio readline liburcu json_c linuxHeaders ]; makeFlags = [ "LIB=lib" "prefix=$(out)" + "systemd_prefix=$(out)" + "kernel_incdir=${linuxHeaders}/include/" "man8dir=$(out)/share/man/man8" "man5dir=$(out)/share/man/man5" "man3dir=$(out)/share/man/man3" - "SYSTEMDPATH=lib" ]; doCheck = true; From 97255b0701c96a0aa8b9db11577d62410780d7f0 Mon Sep 17 00:00:00 2001 From: zendo Date: Fri, 13 Jan 2023 00:02:00 +0800 Subject: [PATCH 06/49] opera: 90.0.4480.84 -> 94.0.4606.54 --- .../networking/browsers/opera/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 92afe2f4baa0..2de8192150ec 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -41,27 +41,30 @@ , at-spi2-core , autoPatchelfHook , wrapGAppsHook +, qt5 +, proprietaryCodecs ? false +, vivaldi-ffmpeg-codecs }: let - mirror = "https://get.geo.opera.com/pub/opera/desktop"; - -in stdenv.mkDerivation rec { - +in +stdenv.mkDerivation rec { pname = "opera"; - version = "90.0.4480.84"; + version = "94.0.4606.54"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-GMcBTY3Ab8lYWv1IPdCeKPZwbY19NPHYmK7ATzvq0cg="; + hash = "sha256-IMWIkJHKaE7n5Rll4ZExE6PQB9a2fz0hLx4vckbROgk="; }; - unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; + unpackPhase = "dpkg-deb -x $src ."; nativeBuildInputs = [ + dpkg autoPatchelfHook wrapGAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -115,16 +118,22 @@ in stdenv.mkDerivation rec { # "Illegal instruction (core dumped)" gtk3 gtk4 + ] ++ lib.optional proprietaryCodecs [ + vivaldi-ffmpeg-codecs ]; + dontWrapQtApps = true; + installPhase = '' - mkdir -p $out - cp -r . $out/ + mkdir -p $out/bin + cp -r usr $out + cp -r usr/share $out/share + ln -s $out/usr/bin/opera $out/bin/opera ''; meta = with lib; { homepage = "https://www.opera.com"; - description = "Web browser"; + description = "Faster, safer and smarter web browser"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; From 6c615f6957c1a36b2d173f9438d7b63fec9b5cf8 Mon Sep 17 00:00:00 2001 From: Wanja Zaeske Date: Tue, 17 Jan 2023 17:32:03 +0100 Subject: [PATCH 07/49] add rustc and cargo to the cross trunk Compiling them can take hours, and with rust specifically it's quite common to cross compile (e.g. to musl/static for easier distribution) --- pkgs/top-level/release-cross.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index b8719294f98d..f15349da64fa 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -34,6 +34,8 @@ let nix = nativePlatforms; nixUnstable = nativePlatforms; mesa = nativePlatforms; + rustc = nativePlatforms; + cargo = nativePlatforms; }; gnuCommon = lib.recursiveUpdate common { From 161c4dd2ae61f97f0006bdba53abcc3284dda25e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 20 Jan 2023 13:02:03 +0100 Subject: [PATCH 08/49] wslu: supply default conf This fixes running `wslvar USERNAME` after one of the recent update. --- pkgs/tools/system/wslu/default.nix | 9 ++++++++ .../system/wslu/fallback-conf-nix-store.diff | 22 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/system/wslu/fallback-conf-nix-store.diff diff --git a/pkgs/tools/system/wslu/default.nix b/pkgs/tools/system/wslu/default.nix index f765da194c0e..6337e479bb31 100644 --- a/pkgs/tools/system/wslu/default.nix +++ b/pkgs/tools/system/wslu/default.nix @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc="; }; + patches = [ + ./fallback-conf-nix-store.diff + ]; + + postPatch = '' + substituteInPlace src/wslu-header \ + --subst-var out + ''; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" diff --git a/pkgs/tools/system/wslu/fallback-conf-nix-store.diff b/pkgs/tools/system/wslu/fallback-conf-nix-store.diff new file mode 100644 index 000000000000..6315e78d7de4 --- /dev/null +++ b/pkgs/tools/system/wslu/fallback-conf-nix-store.diff @@ -0,0 +1,22 @@ +diff --git a/src/wslu-header b/src/wslu-header +index 5f33925..159c6af 100644 +--- a/src/wslu-header ++++ b/src/wslu-header +@@ -169,11 +169,17 @@ if [ -f "$HOME/.config/wslu/conf" ]; then + debug_echo "$HOME/.config/wslu/conf found, sourcing" + source "$HOME/.config/wslu/conf" + fi ++ + if [ -f "$HOME/.wslurc" ]; then + debug_echo "$HOME/.wslurc found, sourcing" + source "$HOME/.wslurc" + fi + ++if [ -f "@out@/share/wslu/conf" ]; then ++ debug_echo "@out@/share/wslu/conf found, sourcing" ++ source "@out@/share/wslu/conf" ++fi ++ + # functions + + function help { From 614aaaa340928287120854766efc0a78df3e8300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Jan 2023 13:05:04 +0100 Subject: [PATCH 09/49] nix-eval-jobs: 2.12.0 -> 2.12.1 Diff: https://github.com/nix-community/nix-eval-jobs/compare/v2.12.0...2.12.1 --- pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 51d70f15dfcb..cfc23ff619dc 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-HSgW9qKXIWu+nzlWjR7HoIrjO1yn48a0U/E76VwrpQ0="; + hash = "sha256-8nFseSTAIGJdB4P/K/cXAehvdrSLcTTBZLQNs/ZC+I8="; }; buildInputs = [ boost From 1ae2059a34133265e17255e24ebd58ce1a3fa1a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Jan 2023 15:51:49 +0100 Subject: [PATCH 10/49] tts: drop dependency on umap-learn --- pkgs/tools/audio/tts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 0a084498a96d..1f7e9769504d 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -51,7 +51,6 @@ python.pkgs.buildPythonApplication rec { "mecab-python3" "numba" "numpy" - "umap-learn" "unidic-lite" ]; in '' @@ -60,6 +59,8 @@ python.pkgs.buildPythonApplication rec { ''-e 's/${package}.*[<>=]+.*/${package}/g' \'' ) relaxedConstraints)} requirements.txt + # only used for notebooks and visualization + sed -r -i -e '/umap-learn/d' requirements.txt ''; nativeBuildInputs = with python.pkgs; [ @@ -92,7 +93,6 @@ python.pkgs.buildPythonApplication rec { torchaudio-bin tqdm trainer - umap-learn unidic-lite webrtcvad ]; From c0dc2ef1ff9ebd70faf9f8d259b397a3e2e256ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Jan 2023 19:43:03 +0100 Subject: [PATCH 11/49] nixos/rtorrent: make directory permissions configurable --- nixos/modules/services/torrent/rtorrent.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/torrent/rtorrent.nix b/nixos/modules/services/torrent/rtorrent.nix index 627439e1079b..64cda7fb675f 100644 --- a/nixos/modules/services/torrent/rtorrent.nix +++ b/nixos/modules/services/torrent/rtorrent.nix @@ -19,6 +19,15 @@ in { ''; }; + dataPermissions = mkOption { + type = types.str; + default = "0750"; + example = "0755"; + description = lib.mdDoc '' + Unix Permissions in octal on the rtorrent directory. + ''; + }; + downloadDir = mkOption { type = types.str; default = "${cfg.dataDir}/download"; @@ -205,7 +214,7 @@ in { }; }; - tmpfiles.rules = [ "d '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} -" ]; + tmpfiles.rules = [ "d '${cfg.dataDir}' ${cfg.dataPermissions} ${cfg.user} ${cfg.group} -" ]; }; }; } From 5760604c9d94cb2a290bf2d6f27c9c4ecbb29416 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 14 Jan 2023 21:28:01 +0200 Subject: [PATCH 12/49] trilium-desktop: split desktop & server into two files --- pkgs/applications/office/trilium/default.nix | 123 ------------------- pkgs/applications/office/trilium/desktop.nix | 72 +++++++++++ pkgs/applications/office/trilium/server.nix | 55 +++++++++ pkgs/applications/office/trilium/update.sh | 21 ++-- pkgs/top-level/all-packages.nix | 7 +- 5 files changed, 142 insertions(+), 136 deletions(-) delete mode 100644 pkgs/applications/office/trilium/default.nix create mode 100644 pkgs/applications/office/trilium/desktop.nix create mode 100644 pkgs/applications/office/trilium/server.nix diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix deleted file mode 100644 index 08084bfbf7ac..000000000000 --- a/pkgs/applications/office/trilium/default.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, copyDesktopItems, libxshmfence, wrapGAppsHook }: - -let - metaCommon = with lib; { - description = "Hierarchical note taking application with focus on building large personal knowledge bases"; - homepage = "https://github.com/zadam/trilium"; - license = licenses.agpl3Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ fliegendewurst ]; - }; - - version = "0.58.7"; - - desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c"; - - serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka"; - -in { - - trilium-desktop = stdenv.mkDerivation rec { - pname = "trilium-desktop"; - inherit version; - meta = metaCommon // { - mainProgram = "trilium"; - }; - - src = fetchurl desktopSource; - - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - wrapGAppsHook - copyDesktopItems - ]; - - buildInputs = atomEnv.packages ++ [ libxshmfence ]; - - desktopItems = [ - (makeDesktopItem { - name = "Trilium"; - exec = "trilium"; - icon = "trilium"; - comment = meta.description; - desktopName = "Trilium Notes"; - categories = [ "Office" ]; - }) - ]; - - # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch - postPatch = '' - rm ./trilium-portable.sh - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/trilium - mkdir -p $out/share/icons/hicolor/128x128/apps - - cp -r ./* $out/share/trilium - ln -s $out/share/trilium/trilium $out/bin/trilium - - ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png - runHook postInstall - ''; - - # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) - ''; - - dontStrip = true; - - passthru.updateScript = ./update.sh; - }; - - - trilium-server = stdenv.mkDerivation rec { - pname = "trilium-server"; - inherit version; - meta = metaCommon; - - src = fetchurl serverSource; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - stdenv.cc.cc.lib - ]; - - patches = [ - # patch logger to use console instead of rolling files - ./0001-Use-console-logger-instead-of-rolling-files.patch - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/trilium-server - - cp -r ./* $out/share/trilium-server - runHook postInstall - ''; - - postFixup = '' - cat > $out/bin/trilium-server < $out/bin/trilium-server < Date: Sat, 14 Jan 2023 22:22:52 +0200 Subject: [PATCH 13/49] trilium-desktop: add darwin64 --- pkgs/applications/office/trilium/default.nix | 17 +++ pkgs/applications/office/trilium/desktop.nix | 127 +++++++++++-------- pkgs/applications/office/trilium/server.nix | 10 +- pkgs/applications/office/trilium/update.sh | 4 +- pkgs/top-level/all-packages.nix | 7 +- 5 files changed, 99 insertions(+), 66 deletions(-) create mode 100644 pkgs/applications/office/trilium/default.nix diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix new file mode 100644 index 000000000000..74bcb1172d21 --- /dev/null +++ b/pkgs/applications/office/trilium/default.nix @@ -0,0 +1,17 @@ +{ lib, callPackage, ... }: + +let + metaCommon = with lib; { + description = "Hierarchical note taking application with focus on building large personal knowledge bases"; + homepage = "https://github.com/zadam/trilium"; + license = licenses.agpl3Plus; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ fliegendewurst ]; + }; +in { + + trilium-desktop = callPackage ./desktop.nix { metaCommon = metaCommon; }; + trilium-server = callPackage ./server.nix { metaCommon = metaCommon; }; + +} diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 1424c36828b7..03e88a7816d6 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -1,72 +1,89 @@ -{ stdenv, lib, -autoPatchelfHook, fetchurl, atomEnv, makeWrapper, -makeDesktopItem, copyDesktopItems, wrapGAppsHook, -libxshmfence +{ stdenv, lib, unzip, autoPatchelfHook +, fetchurl, atomEnv, makeWrapper +, makeDesktopItem, copyDesktopItems, wrapGAppsHook, libxshmfence +, metaCommon }: let - desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c"; - version = "0.58.7"; -in stdenv.mkDerivation rec { pname = "trilium-desktop"; - inherit version; - meta = with lib; { + version = "0.58.7"; + + linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + linuxSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c"; + + darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; + darwinSource.sha256 = "1khywd77j4f745fvxln01li8qxnhlqqsirhm75kbi24bxlcpxfpa"; + + meta = metaCommon // { mainProgram = "trilium"; - description = "Hierarchical note taking application with focus on building large personal knowledge bases"; - homepage = "https://github.com/zadam/trilium"; - license = licenses.agpl3Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ fliegendewurst ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; - src = fetchurl desktopSource; + linux = stdenv.mkDerivation rec { + pname = "trilium-desktop"; + inherit version; - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - wrapGAppsHook - copyDesktopItems - ]; + src = fetchurl linuxSource; - buildInputs = atomEnv.packages ++ [ libxshmfence ]; + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + wrapGAppsHook + copyDesktopItems + ]; - desktopItems = [ - (makeDesktopItem { - name = "Trilium"; - exec = "trilium"; - icon = "trilium"; - comment = meta.description; - desktopName = "Trilium Notes"; - categories = [ "Office" ]; - }) - ]; + buildInputs = atomEnv.packages ++ [ libxshmfence ]; - # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch - postPatch = '' - rm ./trilium-portable.sh - ''; + desktopItems = [ + (makeDesktopItem { + name = "Trilium"; + exec = "trilium"; + icon = "trilium"; + comment = meta.description; + desktopName = "Trilium Notes"; + categories = [ "Office" ]; + }) + ]; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/trilium - mkdir -p $out/share/icons/hicolor/128x128/apps + # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch + postPatch = '' + rm ./trilium-portable.sh + ''; - cp -r ./* $out/share/trilium - ln -s $out/share/trilium/trilium $out/bin/trilium + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $out/share/trilium + mkdir -p $out/share/icons/hicolor/128x128/apps - ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png - runHook postInstall - ''; + cp -r ./* $out/share/trilium + ln -s $out/share/trilium/trilium $out/bin/trilium - # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) - ''; + ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png + runHook postInstall + ''; - dontStrip = true; + # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) + ''; - passthru.updateScript = ./update.sh; -} + dontStrip = true; + + passthru.updateScript = ./update.sh; + }; + + darwin = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchurl darwinSource; + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; + }; + +in + if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 60a4612834b5..349ae7f4c331 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, autoPatchelfHook, fetchurl, nixosTests }: +{ stdenv, lib, autoPatchelfHook, fetchurl, nixosTests +, metaCommon }: let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; @@ -7,13 +8,8 @@ let in stdenv.mkDerivation rec { pname = "trilium-server"; inherit version; - meta = with lib; { - description = "Hierarchical note taking application with focus on building large personal knowledge bases"; - homepage = "https://github.com/zadam/trilium"; - license = licenses.agpl3Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + meta = metaCommon // { platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ fliegendewurst ]; }; src = fetchurl serverSource; diff --git a/pkgs/applications/office/trilium/update.sh b/pkgs/applications/office/trilium/update.sh index f7bc34b42384..e292609e3f75 100755 --- a/pkgs/applications/office/trilium/update.sh +++ b/pkgs/applications/office/trilium/update.sh @@ -12,8 +12,10 @@ version=$(curl -s --show-error "https://api.github.com/repos/zadam/trilium/relea # Update desktop application sha256_linux64=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz) +sha256_darwin64=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip) setKV ./desktop.nix version $version -setKV ./desktop.nix desktopSource.sha256 $sha256_linux64 +setKV ./desktop.nix linuxSource.sha256 $sha256_linux64 +setKV ./desktop.nix darwinSource.sha256 $sha256_darwin64 # Update server sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 224c43dd7282..87fc70d7834a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12581,9 +12581,10 @@ with pkgs; triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; - trilium-desktop = callPackage ../applications/office/trilium/desktop.nix { }; - - trilium-server = callPackage ../applications/office/trilium/server.nix { }; + inherit (callPackage ../applications/office/trilium {}) + trilium-desktop + trilium-server + ; trousers = callPackage ../tools/security/trousers { }; From 96726e8fb96181d1da32a2f7e49a83f58e0f6972 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 15 Jan 2023 12:58:55 +0200 Subject: [PATCH 14/49] maintainers: add eliandoran --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7311dadb1eef..9b0452566d70 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4134,6 +4134,12 @@ githubId = 103082; name = "Ed Brindley"; }; + eliandoran = { + email = "contact@eliandoran.me"; + name = "Elian Doran"; + github = "eliandoran"; + githubId = 21236836; + }; elizagamedev = { email = "eliza@eliza.sh"; github = "elizagamedev"; From 93ad2ef195537e54c6310db00d07c2667bdb742d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Mon, 16 Jan 2023 22:03:54 +0200 Subject: [PATCH 15/49] trilium-{desktop,server}: add eliandoran to maintainers --- pkgs/applications/office/trilium/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 74bcb1172d21..35b9b694c091 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -7,7 +7,7 @@ let license = licenses.agpl3Plus; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ fliegendewurst ]; + maintainers = with maintainers; [ fliegendewurst eliandoran ]; }; in { From 7db6808335f5307f94f0f49d73669e565f526f46 Mon Sep 17 00:00:00 2001 From: LoveIsGrief Date: Thu, 8 Dec 2022 00:05:50 +0100 Subject: [PATCH 16/49] logseq: Fix publishing graph Related to https://github.com/logseq/logseq/issues/6880 Logseq publishes graphs by copying application assets into a folder and then the graph files (+/- some operations). In a normal linux distribution the application asset directories are rw but only by root. On nix, the directories are read-only, which leads to the copied directories also being ro and logseq failing to copy the graph files into the target. A fix from the logseq team isn't forthcoming (yet?), so we circumvent the entire ro issue by using run-appimage, which extracts the appimage into a user-writeable directory. --- pkgs/applications/misc/logseq/default.nix | 25 ++++++++--------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index ea855f3d30be..9a9db9d70f94 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,8 +2,8 @@ , stdenv , fetchurl , appimageTools +, appimage-run , makeWrapper -, electron , git }: @@ -30,30 +30,23 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/${pname} $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/${pname}/resources/app/icons + cp -a ${appimageContents}/resources/app/icons/logseq.png $out/share/${pname}/resources/app/icons/logseq.png cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop - # remove the `git` in `dugite` because we want the `git` in `nixpkgs` - chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git - chmod +w $out/share/${pname}/resources/app/node_modules/dugite - rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git - chmod -w $out/share/${pname}/resources/app/node_modules/dugite + # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs + makeWrapper ${appimage-run}/bin/appimage-run $out/bin/logseq \ + --set "LOCAL_GIT_DIRECTORY" ${git} \ + --add-flags ${src} + # Make the desktop entry run the app using appimage-run substituteInPlace $out/share/applications/${pname}.desktop \ - --replace Exec=Logseq Exec=${pname} \ + --replace Exec=Logseq "Exec=$out/bin/logseq" \ --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png runHook postInstall ''; - postFixup = '' - # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --set "LOCAL_GIT_DIRECTORY" ${git} \ - --add-flags $out/share/${pname}/resources/app - ''; - passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf00bf10fc8b..cf5ea79356d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2487,9 +2487,7 @@ with pkgs; lilo = callPackage ../tools/misc/lilo { }; - logseq = callPackage ../applications/misc/logseq { - electron = electron_20; - }; + logseq = callPackage ../applications/misc/logseq { }; natls = callPackage ../tools/misc/natls { }; From 9995bfa17dcaa144b2dd00ce3a9aa8b541535608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Jan 2023 15:37:24 +0100 Subject: [PATCH 17/49] python3.pkgs.remote-pdb: init at 2.1.0 This is useful for debugging nixos tests in a different window: ```console $ nix build ".#checks.x86_64-linux..driver" -L PYTHONBREAKPOINT=remote_pdb.set_trace REMOTE_PDB_HOST=127.0.0.1 REMOTE_PDB_PORT=4444 ./result/bin/nixos-test-driver ``` ```python { extraPythonPackages = ps: [ ps.remote-pdb ]; testScript = '' breakpoint() ''; } ``` --- .../python-modules/remote-pdb/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/remote-pdb/default.nix diff --git a/pkgs/development/python-modules/remote-pdb/default.nix b/pkgs/development/python-modules/remote-pdb/default.nix new file mode 100644 index 000000000000..174b0bff311d --- /dev/null +++ b/pkgs/development/python-modules/remote-pdb/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage, fetchFromGitHub, lib }: +buildPythonPackage rec { + pname = "remote-pdb"; + version = "2.1.0"; + src = fetchFromGitHub { + owner = "ionelmc"; + repo = "python-remote-pdb"; + rev = "v${version}"; + sha256 = "sha256-/7RysJOJigU4coC6d/Ob2lrtw8u8nLZI8wBk4oEEY3g="; + }; + meta = with lib; { + description = "Remote vanilla PDB (over TCP sockets)."; + homepage = "https://github.com/ionelmc/python-remote-pdb"; + license = licenses.bsd2; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6af3091cf24..54895ba8801f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9855,6 +9855,8 @@ self: super: with self; { remi = callPackage ../development/python-modules/remi { }; + remote-pdb = callPackage ../development/python-modules/remote-pdb { }; + renault-api = callPackage ../development/python-modules/renault-api { }; rencode = callPackage ../development/python-modules/rencode { }; From 0ac4b2825cba5105a6f412c62a8f7ab615392b93 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 Jan 2023 04:20:00 +0000 Subject: [PATCH 18/49] postgresqlPackages.plpgsql_check: 2.2.6 -> 2.3.0 https://github.com/okbob/plpgsql_check/releases/tag/v2.3.0 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 4c5b00609918..14078659aeac 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.2.6"; + version = "2.3.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - hash = "sha256-8HFyIzJ1iF3K2vTlibFallvkMKjFTJ2DO64fORToD8E="; + hash = "sha256-zl7AF+1hj6UFnf9sKO40ZTzm7edKguUYFqaT5/qf8Ic="; }; buildInputs = [ postgresql ]; From 763094d2347f69eec82d04932bceeae0b65a6d03 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 28 Jan 2023 14:09:06 +0100 Subject: [PATCH 19/49] vscode-extensions.james-yu.latex-workshop: 9.4.4 -> 9.5.0 https://github.com/James-Yu/LaTeX-Workshop/releases/tag/v9.5.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 0dfed1116433..05f1bc3dd577 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1504,8 +1504,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "9.4.4"; - sha256 = "sha256-EA3OABn80GciNecXwLcorWP7K3+jI+wgujpmvvFcNOA="; + version = "9.5.0"; + sha256 = "sha256-Av4RYnCh0gXQ+uRByl3Can+hvYD8Pc3x0Ec2jDcP6Fk="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; From 03f7d36b21f17bed02be3adb1b0619f9c741feca Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 28 Jan 2023 14:13:32 +0100 Subject: [PATCH 20/49] vscode-extensions.vscodevim.vim: 1.24.1 -> 1.24.3 https://github.com/VSCodeVim/Vim/releases/tag/v1.24.3 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 05f1bc3dd577..6ba779276a6c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2941,8 +2941,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.24.1"; - sha256 = "00gq6mqqwqipc6d7di2x9mmi1lya11vhkkww9563avchavczb9sv"; + version = "1.24.3"; + sha256 = "sha256-4fPoRBttWVE8Z3e4O6Yrkf04iOu9ElspQFP57HOPVAk="; }; meta = { license = lib.licenses.mit; From cc6a12e6ecb168064d96982f8b732864bc506508 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 28 Jan 2023 14:18:13 +0100 Subject: [PATCH 21/49] vscode-extensions.marp-team.marp-vscode: 1.5.0 -> 2.4.1 https://github.com/marp-team/marp-vscode/releases/tag/v2.4.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6ba779276a6c..88eabea0ff2c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1790,8 +1790,8 @@ let mktplcRef = { name = "marp-vscode"; publisher = "marp-team"; - version = "1.5.0"; - sha256 = "0wqsj8rp58vl3nafkjvyw394h5j4jd7d24ra6hkvfpnlzrgv4yhs"; + version = "2.4.1"; + sha256 = "sha256-h59OmFreja9IdFzH2zZaXXh+pnODirL2fPkUmvAgDyA="; }; meta = { license = lib.licenses.mit; From 82103fb6746ef7f66295ddbce17f4676621716ec Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 28 Jan 2023 14:25:03 +0100 Subject: [PATCH 22/49] vscode-extensions.bierner.markdown-mermaid: 1.14.2 -> 1.17.4 https://github.com/mjbvz/vscode-markdown-mermaid/releases/tag/1.17.4 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 88eabea0ff2c..e3dad3b928cd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -546,8 +546,8 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.14.2"; - sha256 = "RZyAY2d3imnLhm1mLur+wTx/quxrNWYR9PCjC+co1FE="; + version = "1.17.4"; + sha256 = "sha256-jJnALJJc8G4/0L7WMmKSZ7I+7Usmyj+WhufBdSzcEK0="; }; meta = with lib; { license = licenses.mit; From 7efef84f2506929210506dd0a89451b9255c01b4 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 28 Jan 2023 14:27:12 +0100 Subject: [PATCH 23/49] vscode-extensions.catppuccin.catppuccin-vsc: 2.2.1 -> 2.5.0 https://github.com/catppuccin/vscode/releases/tag/v2.5.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e3dad3b928cd..367cdf21debc 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -624,8 +624,8 @@ let mktplcRef = { name = "catppuccin-vsc"; publisher = "catppuccin"; - version = "2.2.1"; - sha256 = "sha256-vS+hz3RxG71F5QoO4LQOgOgFh6GQ8QX/+4mMD0KC1kA="; + version = "2.5.0"; + sha256 = "sha256-+dM6MKIjzPdYoRe1DYJ08A+nHHlkTsm+I6CYmnmSRj4="; }; meta = with lib; { description = "Soothing pastel theme for VSCode"; From f1d4f49ef524b2fe0a95a415129a76950ea491d6 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 28 Jan 2023 14:31:44 +0100 Subject: [PATCH 24/49] vscode-extensions.golang.go: 0.33.1 -> 0.37.1 https://github.com/golang/vscode-go/releases/tag/v0.37.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 367cdf21debc..3c3a824591e4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1351,8 +1351,8 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.33.1"; - sha256 = "0dsjxs04dchw1dbzf45ryhxsb5xhalqwy40xw6cngxkp69lhf91g"; + version = "0.37.1"; + sha256 = "sha256-xOiMVUkcgwkMjYfNzFB3Qhfg26jf5nssaTfw0U+sAX0="; }; meta = { license = lib.licenses.mit; From 604b54a0a90d5c02fcde2ed2fe4bc3e6342c3952 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 28 Jan 2023 14:34:53 +0100 Subject: [PATCH 25/49] vscode-extensions.jdinhlife.gruvbox: 1.5.1 -> 1.8.0 https://github.com/jdinhify/vscode-theme-gruvbox/releases/tag/v1.8.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3c3a824591e4..3648a1cb0841 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1520,8 +1520,8 @@ let mktplcRef = { name = "gruvbox"; publisher = "jdinhlife"; - version = "1.5.1"; - sha256 = "sha256-0ghB0E+Wa9W2bNFFiH2Q3pUJ9HV5+JfKohX4cRyevC8="; + version = "1.8.0"; + sha256 = "sha256-P4FbbcRcKWbnC86TSnzQaGn2gHWkDM9I4hj4GiHNPS4="; }; meta = with lib; { description = "Gruvbox Theme"; From 5b28044de6355b77a4ede9e16d52c6c3d972386a Mon Sep 17 00:00:00 2001 From: zendo Date: Sun, 29 Jan 2023 16:33:43 +0800 Subject: [PATCH 26/49] completely: init at 0.5.2 --- pkgs/tools/misc/completely/Gemfile | 2 ++ pkgs/tools/misc/completely/Gemfile.lock | 20 +++++++++++ pkgs/tools/misc/completely/default.nix | 21 ++++++++++++ pkgs/tools/misc/completely/gemset.nix | 44 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 89 insertions(+) create mode 100644 pkgs/tools/misc/completely/Gemfile create mode 100644 pkgs/tools/misc/completely/Gemfile.lock create mode 100644 pkgs/tools/misc/completely/default.nix create mode 100644 pkgs/tools/misc/completely/gemset.nix diff --git a/pkgs/tools/misc/completely/Gemfile b/pkgs/tools/misc/completely/Gemfile new file mode 100644 index 000000000000..bfae92920327 --- /dev/null +++ b/pkgs/tools/misc/completely/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'completely' diff --git a/pkgs/tools/misc/completely/Gemfile.lock b/pkgs/tools/misc/completely/Gemfile.lock new file mode 100644 index 000000000000..656c96cbc40c --- /dev/null +++ b/pkgs/tools/misc/completely/Gemfile.lock @@ -0,0 +1,20 @@ +GEM + remote: https://rubygems.org/ + specs: + colsole (0.8.2) + completely (0.5.2) + colsole (~> 0.6) + mister_bin (~> 0.7.2) + docopt (0.6.1) + mister_bin (0.7.3) + colsole (~> 0.7) + docopt (~> 0.6) + +PLATFORMS + ruby + +DEPENDENCIES + completely + +BUNDLED WITH + 2.4.5 diff --git a/pkgs/tools/misc/completely/default.nix b/pkgs/tools/misc/completely/default.nix new file mode 100644 index 000000000000..7e0129f6d1b3 --- /dev/null +++ b/pkgs/tools/misc/completely/default.nix @@ -0,0 +1,21 @@ +{ lib +, bundlerApp +, bundlerUpdateScript +}: + +bundlerApp { + pname = "completely"; + + gemdir = ./.; + exes = [ "completely" ]; + + passthru.updateScript = bundlerUpdateScript "completely"; + + meta = with lib; { + description = "Generate bash completion scripts using a simple configuration file"; + homepage = "https://github.com/DannyBen/completely"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/tools/misc/completely/gemset.nix b/pkgs/tools/misc/completely/gemset.nix new file mode 100644 index 000000000000..a078a113f6d4 --- /dev/null +++ b/pkgs/tools/misc/completely/gemset.nix @@ -0,0 +1,44 @@ +{ + colsole = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l29sxy4p9jbvcihckxfsyqx98b8xwzd3hjqvdh1zxw8nv5walnp"; + type = "gem"; + }; + version = "0.8.2"; + }; + completely = { + dependencies = ["colsole" "mister_bin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w7cmmsp9m42c8w4j03kr98zy7x7yszw3qsm3ww600dmc0d0xd2b"; + type = "gem"; + }; + version = "0.5.2"; + }; + docopt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rvlfbb7kzyagncm4zdpcjwrh682zamgf5rcf5qmj0bd6znkgy3k"; + type = "gem"; + }; + version = "0.6.1"; + }; + mister_bin = { + dependencies = ["colsole" "docopt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f51zs9wjpslhdadp8yfx4ij0jj1ya92cbzqlfd2wfr19wdr2jgd"; + type = "gem"; + }; + version = "0.7.3"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e80b17093aeb..72c4bf12ed8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28497,6 +28497,8 @@ with pkgs; complete-alias = callPackage ../tools/misc/complete-alias { }; + completely = callPackage ../tools/misc/completely { }; + confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; copyq = qt6Packages.callPackage ../applications/misc/copyq { }; From 859f4aa1722ce688f320586d0c90ce76d0bd2158 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 29 Jan 2023 16:03:35 +0100 Subject: [PATCH 27/49] nixos/tests/grafana/provision: fix test Not sure why the tmpfile rule fails now, so let's quick-fix it with an activation script. --- nixos/tests/grafana/provision/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 1eb927632eb7..96378452ade3 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -22,9 +22,15 @@ let }; }; - systemd.tmpfiles.rules = [ - "L /var/lib/grafana/dashboards/test.json 0700 grafana grafana - ${pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json)}" - ]; + system.activationScripts.setup-grafana = { + deps = [ "users" ]; + text = '' + mkdir -p /var/lib/grafana/dashboards + chown -R grafana:grafana /var/lib/grafana + chmod 0700 -R /var/lib/grafana/dashboards + cp ${pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json)} /var/lib/grafana/dashboards/ + ''; + }; }; extraNodeConfs = { From 32576447c051c890d2be51b75036bc7a11667e91 Mon Sep 17 00:00:00 2001 From: zendo Date: Sun, 18 Dec 2022 21:53:36 +0800 Subject: [PATCH 28/49] cavalier: init at 2023.01.29 --- pkgs/applications/audio/cavalier/default.nix | 68 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/applications/audio/cavalier/default.nix diff --git a/pkgs/applications/audio/cavalier/default.nix b/pkgs/applications/audio/cavalier/default.nix new file mode 100644 index 000000000000..17fdabc5bc0d --- /dev/null +++ b/pkgs/applications/audio/cavalier/default.nix @@ -0,0 +1,68 @@ +{ lib +, python3 +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gobject-introspection +, glib +, gtk4 +, librsvg +, libadwaita +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +, cava +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cavalier"; + version = "2023.01.29"; + format = "other"; + + src = fetchFromGitHub { + owner = "fsobolev"; + repo = pname; + rev = version; + hash = "sha256-6bvi73cFQHtIyD4d4+mqje0qkmG4wkahZ2ohda5RvRQ="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + librsvg + libadwaita + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + ]; + + # Prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH ":" "${lib.makeBinPath [ cava ]}" + ) + ''; + + meta = with lib; { + description = "Audio visualizer based on CAVA with customizable LibAdwaita interface"; + homepage = "https://github.com/fsobolev/cavalier"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e257717b565c..d34d3ea74985 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27895,6 +27895,8 @@ with pkgs; cava = callPackage ../applications/audio/cava { }; + cavalier = callPackage ../applications/audio/cavalier { }; + cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; From a90089e31c053d61ee9ea09933a9af3151878678 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 30 Jan 2023 17:38:28 +0800 Subject: [PATCH 29/49] ms-python.python: 2022.19.13351014 -> 2023.1.10091012 Co-authored-by: superherointj <5861043+superherointj@users.noreply.github.com> --- .../editors/vscode/extensions/python/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix index f7765e6ceb1a..0a62a5b02daa 100644 --- a/pkgs/applications/editors/vscode/extensions/python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -12,6 +12,7 @@ , curl , coreutils , gnused +, jq , nix }: @@ -19,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2022.19.13351014"; - sha256 = "1562f4b0v76p1wfbljc5zydq7aq7k5hshxzm2v1whb77cjskiw8s"; + version = "2023.1.10091012"; + sha256 = "sha256-JosFv6ngJmw1XRILwTZMVxlGIdWFLFQjj4olfnVwAIM="; }; buildInputs = [ icu ]; @@ -29,7 +30,6 @@ vscode-utils.buildVscodeMarketplaceExtension rec { propagatedBuildInputs = with python3.pkgs; [ debugpy - isort jedi-language-server ]; @@ -57,14 +57,16 @@ vscode-utils.buildVscodeMarketplaceExtension rec { curl coreutils gnused + jq nix ]} api=$(curl -s 'https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery' \ -H 'accept: application/json;api-version=3.0-preview.1' \ -H 'content-type: application/json' \ - --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"${mktplcRef.publisher}.${mktplcRef.name}"}]}],"flags":512}') - version=$(echo $api | sed -n -E 's|^.*"version":"([0-9.]+)".*$|\1|p') + --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"${mktplcRef.publisher}.${mktplcRef.name}"}]}],"flags":16}') + # Find the latest version compatible with stable vscode version + version=$(echo $api | jq -r '.results[0].extensions[0].versions | map(select(has("properties"))) | map(select(.properties | map(select(.key == "Microsoft.VisualStudio.Code.Engine")) | .[0].value | test("\\^[0-9.]+$"))) | .[0].version') if [[ $version != ${mktplcRef.version} ]]; then tmp=$(mktemp) From 0bc340117ac2e88f3e0a9f6cb3a4c2b269b8151c Mon Sep 17 00:00:00 2001 From: lunik1 Date: Sun, 29 Jan 2023 22:32:50 +0000 Subject: [PATCH 30/49] iosevka: use buildNpmPackage --- pkgs/data/fonts/iosevka/default.nix | 52 +- pkgs/data/fonts/iosevka/node-composition.nix | 17 - pkgs/data/fonts/iosevka/node-packages.nix | 2697 ----------------- pkgs/data/fonts/iosevka/update-default.sh | 21 - .../node-packages/node-packages.json | 1 - 5 files changed, 19 insertions(+), 2769 deletions(-) delete mode 100644 pkgs/data/fonts/iosevka/node-composition.nix delete mode 100644 pkgs/data/fonts/iosevka/node-packages.nix delete mode 100755 pkgs/data/fonts/iosevka/update-default.sh diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index d9efb0eedcd7..05acabb08524 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, remarshal +{ stdenv +, lib +, pkgs +, buildNpmPackage +, fetchFromGitHub +, nodejs +, remarshal , ttfautohint-nox # Custom font set options. # See https://typeof.net/Iosevka/customizer @@ -47,36 +53,20 @@ assert (privateBuildPlan != null) -> set != null; assert (extraParameters != null) -> set != null; -let - # We don't know the attribute name for the Iosevka package as it - # changes not when our update script is run (which in turn updates - # node-packages.json, but when node-packages/generate.sh is run - # (which updates node-packages.nix). - # - # Doing it this way ensures that the package can always be built, - # although possibly an older version than ioseva-bin. - nodeIosevka = (import ./node-composition.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; - }).package.override { - src = fetchFromGitHub { - owner = "be5invis"; - repo = "Iosevka"; - rev = "v15.6.3"; - hash = "sha256-wsFx5sD1CjQTcmwpLSt97OYFI8GtVH54uvKQLU1fWTg="; - }; +buildNpmPackage rec { + pname = if set != null then "iosevka-${set}" else "iosevka"; + version = "17.1.0"; + + src = fetchFromGitHub { + owner = "be5invis"; + repo = "iosevka"; + rev = "v${version}"; + hash = "sha256-xGRymDhkNP9b2JYTEu4M/CrRINmMGY2S5ZuM3Ot1wGg="; }; -in -stdenv.mkDerivation rec { - pname = if set != null then "iosevka-${set}" else "iosevka"; - inherit (nodeIosevka) version src; + npmDepsHash = "sha256-Ncf07ggyOnz/2SpgdmaYS2X/8Bad+J2sz8Yyx9Iri3E="; - nativeBuildInputs = [ - nodejs - remarshal - ttfautohint-nox - ]; + nativeBuildInputs = [ nodejs remarshal ttfautohint-nox ]; buildPlan = if builtins.isAttrs privateBuildPlan @@ -105,7 +95,6 @@ stdenv.mkDerivation rec { echo -e "\n" >> params/parameters.toml cat "$extraParametersPath" >> params/parameters.toml ''} - ln -s ${nodeIosevka}/lib/node_modules/iosevka/node_modules . runHook postConfigure ''; @@ -126,10 +115,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru = { - updateScript = ./update-default.sh; - }; - meta = with lib; { homepage = "https://be5invis.github.io/Iosevka"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; @@ -146,6 +131,7 @@ stdenv.mkDerivation rec { babariviere rileyinman AluisioASG + lunik1 ]; }; } diff --git a/pkgs/data/fonts/iosevka/node-composition.nix b/pkgs/data/fonts/iosevka/node-composition.nix deleted file mode 100644 index 2e810490ca8d..000000000000 --- a/pkgs/data/fonts/iosevka/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: - -let - nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/data/fonts/iosevka/node-packages.nix b/pkgs/data/fonts/iosevka/node-packages.nix deleted file mode 100644 index cff861ddfbf6..000000000000 --- a/pkgs/data/fonts/iosevka/node-packages.nix +++ /dev/null @@ -1,2697 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@eslint/eslintrc-1.3.0" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz"; - sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; - }; - }; - "@humanwhocodes/config-array-0.9.5" = { - name = "_at_humanwhocodes_slash_config-array"; - packageName = "@humanwhocodes/config-array"; - version = "0.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"; - sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; - }; - }; - "@humanwhocodes/object-schema-1.2.1" = { - name = "_at_humanwhocodes_slash_object-schema"; - packageName = "@humanwhocodes/object-schema"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; - sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; - }; - }; - "@iarna/toml-2.2.5" = { - name = "_at_iarna_slash_toml"; - packageName = "@iarna/toml"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz"; - sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; - }; - }; - "@msgpack/msgpack-2.7.2" = { - name = "_at_msgpack_slash_msgpack"; - packageName = "@msgpack/msgpack"; - version = "2.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.7.2.tgz"; - sha512 = "rYEi46+gIzufyYUAoHDnRzkWGxajpD9vVXFQ3g1vbjrBm6P7MBmm+s/fqPa46sxa+8FOUdEuRQKaugo5a4JWpw=="; - }; - }; - "@ot-builder/bin-composite-types-1.5.3" = { - name = "_at_ot-builder_slash_bin-composite-types"; - packageName = "@ot-builder/bin-composite-types"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.3.tgz"; - sha512 = "5yZAaqs2/zJjtELtSNjbOlFuvs0bCuadanLjaEQwX6MS88Q3lO8p0y8AbLaXbKlV7ODiHRqqR42F1rpJ9r0KqQ=="; - }; - }; - "@ot-builder/bin-util-1.5.3" = { - name = "_at_ot-builder_slash_bin-util"; - packageName = "@ot-builder/bin-util"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.3.tgz"; - sha512 = "wbWc6T40IUvNEvyXVpdLY9ntwI3Sj1Lf/qxb3U8Xhe3PEM42xgBEYecE64eU1Y30faxfY3MSb+M5eVgF+s+Prg=="; - }; - }; - "@ot-builder/cli-help-shower-1.5.3" = { - name = "_at_ot-builder_slash_cli-help-shower"; - packageName = "@ot-builder/cli-help-shower"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.3.tgz"; - sha512 = "LFmbbsXvJm9E2swvOq/EHIegP+tJ10bP63+VxFjjN5+q9938WPyT0XtPd1dR2wN2HyRRAExYaNUiyRV6z160tw=="; - }; - }; - "@ot-builder/cli-proc-1.5.3" = { - name = "_at_ot-builder_slash_cli-proc"; - packageName = "@ot-builder/cli-proc"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.3.tgz"; - sha512 = "8tovAA4NyPONsJYUdfeWZlI9w1JEeFOW5D3oE+VydbGZw3wIWuK4gz7XgwS4eOM2xM6e/cMpIuzZ4qBmPJCmaA=="; - }; - }; - "@ot-builder/cli-shared-1.5.3" = { - name = "_at_ot-builder_slash_cli-shared"; - packageName = "@ot-builder/cli-shared"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.3.tgz"; - sha512 = "6sVkJd1fg5lOEEW2p2GfVUclAFjcnfaTfDaGETAk3tsxW4mYDj5cQP5B7nU7uK09a1545CS5sZHNcdd7mf9RiA=="; - }; - }; - "@ot-builder/common-impl-1.5.3" = { - name = "_at_ot-builder_slash_common-impl"; - packageName = "@ot-builder/common-impl"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.3.tgz"; - sha512 = "JSOt5yF/GjtMCQH+0xYUHUB4aGPfN/qo4ocvDd0V5W5AEa4vjwmqHyYSSNkXxXM1zdDe8k5FoQSijpzYzZ3pFw=="; - }; - }; - "@ot-builder/errors-1.5.3" = { - name = "_at_ot-builder_slash_errors"; - packageName = "@ot-builder/errors"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.3.tgz"; - sha512 = "NDsKCXNSdDiLyS6/vPDY3qWh/jAP1v3Eol/FtqDqSXOBUPPgg4XGlZR2zl3gSc99YbbSC5KecvRSh99YUMpKPQ=="; - }; - }; - "@ot-builder/io-bin-cff-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-cff"; - packageName = "@ot-builder/io-bin-cff"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.3.tgz"; - sha512 = "/oSc2k6hIh1WLpWBwjsoj1dp1KMnsKHM8JnI+undRasuDSi5QnNtbeqKWl+OlYYo5ES8RSopsLg0sCMAP2gnyw=="; - }; - }; - "@ot-builder/io-bin-encoding-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-encoding"; - packageName = "@ot-builder/io-bin-encoding"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.3.tgz"; - sha512 = "xG1dBbVHhboHCQ6n5nxnScaevCTShQ5rvFusRrC5MKKHFLL/1Vj2qk28ZWzHYP8nZfO7+ktU2HGsKkydnlWDeg=="; - }; - }; - "@ot-builder/io-bin-ext-private-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-ext-private"; - packageName = "@ot-builder/io-bin-ext-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.3.tgz"; - sha512 = "zwG4xDd1sAfbdQ4W/u86CMhBYtCK1/Eg04qDUVmBxcM4RBNjqKt55yN+nPTtQ+aeXBYN79DXM7gFZU4rFAmOIA=="; - }; - }; - "@ot-builder/io-bin-font-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-font"; - packageName = "@ot-builder/io-bin-font"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.3.tgz"; - sha512 = "fvccA/kbnVwIxNs/qgtTla9vj2www94HKKndF4EvkMINqksyaSoSBlaoddTrzb+caw/kANVGprfBmtjWZBEh+Q=="; - }; - }; - "@ot-builder/io-bin-glyph-store-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-glyph-store"; - packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.3.tgz"; - sha512 = "CsSy45gxKjH6Ivl00uprhsuwBWjy9GTfSD39qrXJK+WzIkU8ucM7RRRucwTXR4YKb7sVZUB/wwS+ViQMtu+xKg=="; - }; - }; - "@ot-builder/io-bin-layout-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-layout"; - packageName = "@ot-builder/io-bin-layout"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.3.tgz"; - sha512 = "rwAqkyJf+LSj8UFglas9hopsrOKNF4wwm32w/JJwwX/12LCMw68dzdu2qXvVgLHrnkrqjs5xmGDUY1JVkKwYpA=="; - }; - }; - "@ot-builder/io-bin-metadata-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-metadata"; - packageName = "@ot-builder/io-bin-metadata"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.3.tgz"; - sha512 = "+wSCWKRJ0HfA2oTXQda7uWmm9CAWhLnIQIz7s/hY92Nd7DXbJQG0c2RE2uXazqe9et8HYF6rqJUhOHHH5AsfbQ=="; - }; - }; - "@ot-builder/io-bin-metric-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-metric"; - packageName = "@ot-builder/io-bin-metric"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.3.tgz"; - sha512 = "Og2erTx12QmbguvdFk+5KFyoNOME0QMH2OaCih3G2/P/EJPrHGZEHkw38QsWQPa0LbPfatyhyvrURtZXQo4S9g=="; - }; - }; - "@ot-builder/io-bin-name-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-name"; - packageName = "@ot-builder/io-bin-name"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.3.tgz"; - sha512 = "BfJUVaZUrI372f4dHjEED3En0Ve4oItaZcqXPUySUpq9s+MgBIi+3Kq9WrDWlpDKRYLR+CsTrwW69TXBIGIa7w=="; - }; - }; - "@ot-builder/io-bin-sfnt-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-sfnt"; - packageName = "@ot-builder/io-bin-sfnt"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.3.tgz"; - sha512 = "tr6EHaV9aWf20veLLa22PSRZwJek/Sgsc6aPghKlSUPdpkL3SIwyVfwDxjzWCQLpcZJXa3YZ+wptuTdMlP7jJw=="; - }; - }; - "@ot-builder/io-bin-ttf-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-ttf"; - packageName = "@ot-builder/io-bin-ttf"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.3.tgz"; - sha512 = "A5IAzoqdCTznsqmZ+bSlF6rNuZ1KQXjX5ZqrYtOk2oCj2hdIgCCvZFhnE9dMPQ3oFRzeYGTl1SvxqX+eDZR18Q=="; - }; - }; - "@ot-builder/io-bin-vtt-private-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-vtt-private"; - packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.3.tgz"; - sha512 = "vMkjn5WbpEFyy3PkU65AhIX6E0YrPbhZV5Wti9O+m/TDmtgcX+fbe3/LJnVtP2JUHDmCQtxnnb+A2Ymp1mwRdw=="; - }; - }; - "@ot-builder/ot-1.5.3" = { - name = "_at_ot-builder_slash_ot"; - packageName = "@ot-builder/ot"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.3.tgz"; - sha512 = "6ZlRH54FjVAf7Vtxlby5+25/fIZC/IIRt8HCE903dKtw6UYG9XJvW7SkPOu18LNNNKHyCzj3LwMawu+LDHtwHw=="; - }; - }; - "@ot-builder/ot-encoding-1.5.3" = { - name = "_at_ot-builder_slash_ot-encoding"; - packageName = "@ot-builder/ot-encoding"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.3.tgz"; - sha512 = "jz6Zg1fwYdlliwPWBghzYIOmqgN5S1xTjX/P8/dk0Jn0cpwyGN409uVkUJb3GuVa/sECQUcvnjTx39DlZSM/Qw=="; - }; - }; - "@ot-builder/ot-ext-private-1.5.3" = { - name = "_at_ot-builder_slash_ot-ext-private"; - packageName = "@ot-builder/ot-ext-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.3.tgz"; - sha512 = "Y233Lrk9Fv4g6k5A/9afPG8E0O28JWKjl7Gv2AW65bL9A7NCyHI6F7SgCLVcbPWj8jyEJ0urm43hsSNeBDqZdQ=="; - }; - }; - "@ot-builder/ot-glyphs-1.5.3" = { - name = "_at_ot-builder_slash_ot-glyphs"; - packageName = "@ot-builder/ot-glyphs"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.3.tgz"; - sha512 = "AIvIui15gNip1Zz3WLWFj/lYOLJWMNF1KDZ/sm3Ig+sTLM70C31AKNzA5HCDKQkKlWjE6IDsJ6gBCE2dwZNApg=="; - }; - }; - "@ot-builder/ot-layout-1.5.3" = { - name = "_at_ot-builder_slash_ot-layout"; - packageName = "@ot-builder/ot-layout"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.3.tgz"; - sha512 = "3yHkyFYAHZJRUtBO9XCOnVTEsOPpUZEOcxjZ9yznID7CGW3LnFe1CmEByJcWf4YPXNQ7fmu0A4qvKGiB7v5oQw=="; - }; - }; - "@ot-builder/ot-metadata-1.5.3" = { - name = "_at_ot-builder_slash_ot-metadata"; - packageName = "@ot-builder/ot-metadata"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.3.tgz"; - sha512 = "0wgd74aZEeBsCRgVTxXQV+0hrgbgRPIM8LVcaJCoS5G5ADGamlriyFCd0DEJkMOvvEcm7fDw5G/BBNIj0nhsag=="; - }; - }; - "@ot-builder/ot-name-1.5.3" = { - name = "_at_ot-builder_slash_ot-name"; - packageName = "@ot-builder/ot-name"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.3.tgz"; - sha512 = "OyLlvvUKulBmwpv6OPipUyN/EWVxyjx2a4LohoYyh5NQKjWuyVcpcknd90LDdCTEEw5WNvkIyo7cqkf3MOehxQ=="; - }; - }; - "@ot-builder/ot-sfnt-1.5.3" = { - name = "_at_ot-builder_slash_ot-sfnt"; - packageName = "@ot-builder/ot-sfnt"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.3.tgz"; - sha512 = "YnDHrVTd48LPe7Zhjveije8f04okb/Le55PurHFKmJlWJSG2b6DGXkZd7Dov/jZoiPUeFO6suaRqkw0Em/4mVg=="; - }; - }; - "@ot-builder/ot-standard-glyph-namer-1.5.3" = { - name = "_at_ot-builder_slash_ot-standard-glyph-namer"; - packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.3.tgz"; - sha512 = "j1n938jXFVgHl+QnZVZG/nfKIAD/UgbPHB4kzAl9RKWfQXDBZn9kL8GZ3HpBydIUTAD2YYzYRYMvopfr0p7tww=="; - }; - }; - "@ot-builder/ot-vtt-private-1.5.3" = { - name = "_at_ot-builder_slash_ot-vtt-private"; - packageName = "@ot-builder/ot-vtt-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.3.tgz"; - sha512 = "qz2Rw5ixqCtWj3dWdkVo4rRHfi8vHY42/52IV/Wrs+s1MITCTJEus2GTMCj9Z3W/SkwBvDeC0OGWA3CbdVj3Zw=="; - }; - }; - "@ot-builder/prelude-1.5.3" = { - name = "_at_ot-builder_slash_prelude"; - packageName = "@ot-builder/prelude"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.3.tgz"; - sha512 = "eevWMoYnh4pdQutfCsoSjFUMkGawnBtUllnFxjj/tpfWMSAQFb8vOufQJYP/GS8jn6VKum4+RR88FVgEZ0xPvg=="; - }; - }; - "@ot-builder/primitive-1.5.3" = { - name = "_at_ot-builder_slash_primitive"; - packageName = "@ot-builder/primitive"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.3.tgz"; - sha512 = "iOy+WoWOWFW3dvqTVmh9/qpYHXiqq8cscnWM5IWkOTKJqUICSyacW/qCXIcZejtvTltAHKbIYvNPpNtQl1me/A=="; - }; - }; - "@ot-builder/rectify-1.5.3" = { - name = "_at_ot-builder_slash_rectify"; - packageName = "@ot-builder/rectify"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.3.tgz"; - sha512 = "VSXtw20D1bKZcT7mlMMvn7TW4f3tsObyfJeOcemoIh6HkrbJZYEIhsGO5l260tWOI+XsXVSJeGPGMj0ZlVnuAQ=="; - }; - }; - "@ot-builder/stat-glyphs-1.5.3" = { - name = "_at_ot-builder_slash_stat-glyphs"; - packageName = "@ot-builder/stat-glyphs"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.3.tgz"; - sha512 = "4wXLbCM1oKhVoMVRR1YLXM7ncQWI/pYmPd7TKH9TbBEnGAX83+rWcoTUkD5egMftpCVmbpNy6grsAF3/BFQpOg=="; - }; - }; - "@ot-builder/trace-1.5.3" = { - name = "_at_ot-builder_slash_trace"; - packageName = "@ot-builder/trace"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.3.tgz"; - sha512 = "P1DQOtIDX8as9UGFM9GuUlxXgH3/3Qrizv+HMtFM2FASbn2q7IbIW/MKAO7uIV+UeqW2XAAGV7wRR6/KScGX2w=="; - }; - }; - "@ot-builder/var-store-1.5.3" = { - name = "_at_ot-builder_slash_var-store"; - packageName = "@ot-builder/var-store"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.3.tgz"; - sha512 = "+cMMLYkwgPXx9uaq7aw/8yuXG9/OuULM89GcRJRYJJ/unsPWNefDbTH69J9oKVyRjxc6mfl7jKxwQKbU51Zb2A=="; - }; - }; - "@ot-builder/variance-1.5.3" = { - name = "_at_ot-builder_slash_variance"; - packageName = "@ot-builder/variance"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.3.tgz"; - sha512 = "H19XizofoeoyJaaH2PjygykKJ7BhTRPWgQk4S+qpzIj/6LUN267tbCyQWomq8OW8EVUwGHuxBqKzQf6iAt7pag=="; - }; - }; - "@types/json5-0.0.29" = { - name = "_at_types_slash_json5"; - packageName = "@types/json5"; - version = "0.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"; - sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; - }; - }; - "@unicode/unicode-14.0.0-1.2.2" = { - name = "_at_unicode_slash_unicode-14.0.0"; - packageName = "@unicode/unicode-14.0.0"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-14.0.0/-/unicode-14.0.0-1.2.2.tgz"; - sha512 = "NMs5JhYXGojBQJNJ7DumqktgRqs95Qt1cj6JMPz8lKBfHYRTRn7Am4CdyX/hS1zTn1lKwsWXBpMP9Hp0nelINg=="; - }; - }; - "@xmldom/xmldom-0.8.2" = { - name = "_at_xmldom_slash_xmldom"; - packageName = "@xmldom/xmldom"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.2.tgz"; - sha512 = "+R0juSseERyoPvnBQ/cZih6bpF7IpCXlWbHRoCRzYzqpz6gWHOgf8o4MOEf6KBVuOyqU+gCNLkCWVIJAro8XyQ=="; - }; - }; - "acorn-8.7.1" = { - name = "acorn"; - packageName = "acorn"; - version = "8.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"; - sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; - }; - }; - "acorn-jsx-5.3.2" = { - name = "acorn-jsx"; - packageName = "acorn-jsx"; - version = "5.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; - sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; - }; - }; - "aglfn-1.0.2" = { - name = "aglfn"; - packageName = "aglfn"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/aglfn/-/aglfn-1.0.2.tgz"; - sha512 = "HUvXd7sNFa1aHtYgJnln2jPwzq7UAAOXhYH/+AY6BMdfXxprMxG8IrczlZn6MjjIWpYhpKR5mHwDWTgehZKO4g=="; - }; - }; - "ajv-6.12.6" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; - sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; - }; - }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha512 = "S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg=="; - }; - }; - "ansi-regex-5.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - }; - "ansi-styles-4.3.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - }; - "argparse-2.0.1" = { - name = "argparse"; - packageName = "argparse"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - }; - "array-includes-3.1.5" = { - name = "array-includes"; - packageName = "array-includes"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz"; - sha512 = "iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ=="; - }; - }; - "array.prototype.flat-1.3.0" = { - name = "array.prototype.flat"; - packageName = "array.prototype.flat"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz"; - sha512 = "12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw=="; - }; - }; - "balanced-match-1.0.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - }; - "brace-expansion-1.1.11" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - }; - "call-bind-1.0.2" = { - name = "call-bind"; - packageName = "call-bind"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; - }; - }; - "callsites-3.1.0" = { - name = "callsites"; - packageName = "callsites"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; - sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; - }; - }; - "chainsaw-0.0.9" = { - name = "chainsaw"; - packageName = "chainsaw"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.0.9.tgz"; - sha512 = "nG8PYH+/4xB+8zkV4G844EtfvZ5tTiLFoX3dZ4nhF4t3OCKIb9UvaFyNmeZO2zOSmRWzBoTD+napN6hiL+EgcA=="; - }; - }; - "chalk-4.1.2" = { - name = "chalk"; - packageName = "chalk"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - }; - "cldr-7.2.0" = { - name = "cldr"; - packageName = "cldr"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cldr/-/cldr-7.2.0.tgz"; - sha512 = "NJB6wpFlIVrS4BhA/Q1a6UuS6MuFr5o2XhfosM6a+W+rad/Rt0HLLX3kuXdRrwHQZvla25iuzTkRnxOKjS+VhQ=="; - }; - }; - "cli-cursor-3.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; - }; - }; - "clipper-lib-6.4.2" = { - name = "clipper-lib"; - packageName = "clipper-lib"; - version = "6.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-6.4.2.tgz"; - sha512 = "knglhjQX5ihNj/XCIs6zCHrTemdvHY3LPZP9XB2nq2/3igyYMFueFXtfp84baJvEE+f8pO1ZS4UVeEgmLnAprQ=="; - }; - }; - "cliui-7.0.4" = { - name = "cliui"; - packageName = "cliui"; - version = "7.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; - }; - }; - "color-convert-2.0.1" = { - name = "color-convert"; - packageName = "color-convert"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - }; - "color-name-1.1.4" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - }; - "cross-spawn-7.0.3" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - }; - "debug-3.2.7" = { - name = "debug"; - packageName = "debug"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; - }; - }; - "debug-4.3.4" = { - name = "debug"; - packageName = "debug"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - }; - "deep-is-0.1.4" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - }; - "define-properties-1.1.4" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; - }; - }; - "doctrine-2.1.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"; - sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; - }; - }; - "doctrine-3.0.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; - sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; - }; - }; - "emoji-regex-8.0.0" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; - }; - }; - "es-abstract-1.20.1" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz"; - sha512 = "WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA=="; - }; - }; - "es-shim-unscopables-1.0.0" = { - name = "es-shim-unscopables"; - packageName = "es-shim-unscopables"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"; - sha512 = "Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="; - }; - }; - "es-to-primitive-1.2.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; - }; - }; - "escalade-3.1.1" = { - name = "escalade"; - packageName = "escalade"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - }; - "escape-string-regexp-4.0.0" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; - }; - }; - "escodegen-1.3.3" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; - sha512 = "z9FWgKc48wjMlpzF5ymKS1AF8OIgnKLp9VyN7KbdtyrP/9lndwUFqCtMm+TAJmJf7KJFFYc4cFJfVTTGkKEwsA=="; - }; - }; - "escodegen-2.0.0" = { - name = "escodegen"; - packageName = "escodegen"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz"; - sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; - }; - }; - "escope-1.0.3" = { - name = "escope"; - packageName = "escope"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz"; - sha512 = "PgST3E92KAnuUX/4PXwpE9RI8jubyyTGIN73mfhl0XP4H+hiA7JqvhXNfffs+naSk41Eipq/klcmoGsCrjxPlQ=="; - }; - }; - "eslint-8.18.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz"; - sha512 = "As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA=="; - }; - }; - "eslint-config-prettier-8.5.0" = { - name = "eslint-config-prettier"; - packageName = "eslint-config-prettier"; - version = "8.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz"; - sha512 = "obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q=="; - }; - }; - "eslint-import-resolver-node-0.3.6" = { - name = "eslint-import-resolver-node"; - packageName = "eslint-import-resolver-node"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz"; - sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw=="; - }; - }; - "eslint-module-utils-2.7.3" = { - name = "eslint-module-utils"; - packageName = "eslint-module-utils"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz"; - sha512 = "088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ=="; - }; - }; - "eslint-plugin-import-2.26.0" = { - name = "eslint-plugin-import"; - packageName = "eslint-plugin-import"; - version = "2.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz"; - sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; - }; - }; - "eslint-scope-7.1.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz"; - sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; - }; - }; - "eslint-utils-3.0.0" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; - }; - }; - "eslint-visitor-keys-2.1.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; - }; - }; - "eslint-visitor-keys-3.3.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; - sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; - }; - }; - "esmangle-1.0.1" = { - name = "esmangle"; - packageName = "esmangle"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz"; - sha512 = "+vgj0CirCf7fiZ5Cy1VH7ZovC1qh42mB6GBVN3cxLwZgY1CqIvu9xOdDW8il8Y8ym+fiFLCM3crZFku8rBNLOA=="; - }; - }; - "espree-9.3.2" = { - name = "espree"; - packageName = "espree"; - version = "9.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz"; - sha512 = "D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA=="; - }; - }; - "esprima-1.1.1" = { - name = "esprima"; - packageName = "esprima"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; - sha512 = "qxxB994/7NtERxgXdFgLHIs9M6bhLXc6qtUmWZ3L8+gTQ9qaoyki2887P2IqAYsoENyr8SUbTutStDniOHSDHg=="; - }; - }; - "esprima-4.0.1" = { - name = "esprima"; - packageName = "esprima"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; - }; - }; - "esquery-1.4.0" = { - name = "esquery"; - packageName = "esquery"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; - sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; - }; - }; - "esrecurse-4.3.0" = { - name = "esrecurse"; - packageName = "esrecurse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; - sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; - }; - }; - "esshorten-1.1.1" = { - name = "esshorten"; - packageName = "esshorten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz"; - sha512 = "jvHUQncAuUI/HOzw1a94cGDdgyRUUcVDABU24X2TRb+y4G3ohSllMKjG+ROQVjj5OEVhXYwwsV+OpLOJ63snEA=="; - }; - }; - "estraverse-1.5.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; - sha512 = "FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ=="; - }; - }; - "estraverse-2.0.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz"; - sha512 = "3liNs3aDBUmf9Hl3YRLqz7Zop0iiTxWaa/ayuxoVS441zjjTPowZJ/uH3y5yhPcXmrLj2rS6Pvu7tfOC7kT61A=="; - }; - }; - "estraverse-4.1.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz"; - sha512 = "r3gEa6vc6lGQdrXfo834EaaqnOzYmik8JPg8VB95acIMZRjqaHI0/WMZFoMBGPtS+HCgylwTLoc4Y5yl0owOHQ=="; - }; - }; - "estraverse-5.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; - sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; - }; - }; - "esutils-1.0.0" = { - name = "esutils"; - packageName = "esutils"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; - sha512 = "x/iYH53X3quDwfHRz4y8rn4XcEwwCJeWsul9pF1zldMbGtgOtMNBEOuYWwB1EQlK2LRa1fev3YAgym/RElp5Cg=="; - }; - }; - "esutils-2.0.3" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - }; - "fast-deep-equal-3.1.3" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; - }; - }; - "fast-json-stable-stringify-2.1.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; - }; - }; - "fast-levenshtein-1.0.7" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"; - sha512 = "hYsfI0s4lfQ2rHVFKXwAr/L/ZSbq9TZwgXtZqW7ANcn9o9GKvcbWxOnxx7jykXf/Ezv1V8TvaBEKcGK7DWKX5A=="; - }; - }; - "fast-levenshtein-2.0.6" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - }; - "file-entry-cache-6.0.1" = { - name = "file-entry-cache"; - packageName = "file-entry-cache"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; - }; - }; - "find-up-2.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha512 = "NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ=="; - }; - }; - "flat-cache-3.0.4" = { - name = "flat-cache"; - packageName = "flat-cache"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; - sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; - }; - }; - "flatted-3.2.5" = { - name = "flatted"; - packageName = "flatted"; - version = "3.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; - sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; - }; - }; - "fs-extra-10.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - }; - "function.prototype.name-1.1.5" = { - name = "function.prototype.name"; - packageName = "function.prototype.name"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; - sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; - }; - }; - "functional-red-black-tree-1.0.1" = { - name = "functional-red-black-tree"; - packageName = "functional-red-black-tree"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; - }; - }; - "functions-have-names-1.2.3" = { - name = "functions-have-names"; - packageName = "functions-have-names"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; - sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; - }; - }; - "get-caller-file-2.0.5" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; - }; - }; - "get-intrinsic-1.1.2" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; - sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; - }; - }; - "get-symbol-description-1.0.0" = { - name = "get-symbol-description"; - packageName = "get-symbol-description"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; - }; - }; - "glob-7.2.3" = { - name = "glob"; - packageName = "glob"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - }; - "glob-parent-6.0.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"; - sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="; - }; - }; - "globals-13.15.0" = { - name = "globals"; - packageName = "globals"; - version = "13.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; - sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; - }; - }; - "graceful-fs-4.2.10" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - }; - "has-1.0.3" = { - name = "has"; - packageName = "has"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; - }; - }; - "has-bigints-1.0.2" = { - name = "has-bigints"; - packageName = "has-bigints"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; - sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; - }; - }; - "has-flag-4.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - }; - "has-property-descriptors-1.0.0" = { - name = "has-property-descriptors"; - packageName = "has-property-descriptors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - }; - "has-symbols-1.0.3" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - }; - "has-tostringtag-1.0.0" = { - name = "has-tostringtag"; - packageName = "has-tostringtag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - }; - "hashish-0.0.4" = { - name = "hashish"; - packageName = "hashish"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hashish/-/hashish-0.0.4.tgz"; - sha512 = "xyD4XgslstNAs72ENaoFvgMwtv8xhiDtC2AtzCG+8yF7W/Knxxm9BX+e2s25mm+HxMKh0rBmXVOEGF3zNImXvA=="; - }; - }; - "iconv-lite-0.6.3" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - }; - "ignore-5.2.0" = { - name = "ignore"; - packageName = "ignore"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; - }; - }; - "import-fresh-3.3.0" = { - name = "import-fresh"; - packageName = "import-fresh"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; - sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; - }; - }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - }; - "inherits-2.0.4" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - }; - "internal-slot-1.0.3" = { - name = "internal-slot"; - packageName = "internal-slot"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; - }; - }; - "is-bigint-1.0.4" = { - name = "is-bigint"; - packageName = "is-bigint"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; - sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; - }; - }; - "is-boolean-object-1.1.2" = { - name = "is-boolean-object"; - packageName = "is-boolean-object"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; - sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; - }; - }; - "is-callable-1.2.4" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; - sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; - }; - }; - "is-core-module-2.9.0" = { - name = "is-core-module"; - packageName = "is-core-module"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; - sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; - }; - }; - "is-date-object-1.0.5" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; - sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; - }; - }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; - }; - }; - "is-fullwidth-code-point-3.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; - }; - }; - "is-glob-4.0.3" = { - name = "is-glob"; - packageName = "is-glob"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; - sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; - }; - }; - "is-negative-zero-2.0.2" = { - name = "is-negative-zero"; - packageName = "is-negative-zero"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; - }; - }; - "is-number-object-1.0.7" = { - name = "is-number-object"; - packageName = "is-number-object"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"; - sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; - }; - }; - "is-regex-1.1.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - }; - "is-shared-array-buffer-1.0.2" = { - name = "is-shared-array-buffer"; - packageName = "is-shared-array-buffer"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; - }; - }; - "is-string-1.0.7" = { - name = "is-string"; - packageName = "is-string"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; - sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; - }; - }; - "is-symbol-1.0.4" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; - sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; - }; - }; - "is-weakref-1.0.2" = { - name = "is-weakref"; - packageName = "is-weakref"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; - sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - }; - "js-yaml-4.1.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - }; - "json-schema-traverse-0.4.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - }; - "json-stable-stringify-without-jsonify-1.0.1" = { - name = "json-stable-stringify-without-jsonify"; - packageName = "json-stable-stringify-without-jsonify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; - }; - }; - "json5-1.0.1" = { - name = "json5"; - packageName = "json5"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; - }; - }; - "jsonfile-6.1.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - }; - "levn-0.2.5" = { - name = "levn"; - packageName = "levn"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"; - sha512 = "mvp+NO++YH0B+e8cC/SvJxk6k5Z9Ngd3iXuz7tmT8vZCyQZj/5SI1GkFOiZGGPkm5wWGI9SUrqiAfPq7BJH+0w=="; - }; - }; - "levn-0.3.0" = { - name = "levn"; - packageName = "levn"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; - }; - }; - "levn-0.4.1" = { - name = "levn"; - packageName = "levn"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; - sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; - }; - }; - "locate-path-2.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha512 = "NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA=="; - }; - }; - "lodash.merge-4.6.2" = { - name = "lodash.merge"; - packageName = "lodash.merge"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; - }; - }; - "lru-cache-2.5.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; - sha512 = "dVmQmXPBlTgFw77hm60ud//l2bCuDKkqC2on1EBoM7s9Urm9IQDrnujwZ93NFnAq0dVZ0HBXTS7PwEG+YE7+EQ=="; - }; - }; - "lru-cache-6.0.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - }; - "memoizeasync-1.1.0" = { - name = "memoizeasync"; - packageName = "memoizeasync"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memoizeasync/-/memoizeasync-1.1.0.tgz"; - sha512 = "HMfzdLqClZo8HMyuM9B6TqnXCNhw82iVWRLqd2cAdXi063v2iJB4mQfWFeKVByN8VUwhmDZ8NMhryBwKrPRf8Q=="; - }; - }; - "mimic-fn-2.1.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; - }; - }; - "minimatch-3.1.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - }; - "minimist-1.2.6" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; - "natural-compare-1.4.0" = { - name = "natural-compare"; - packageName = "natural-compare"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; - sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; - }; - }; - "object-inspect-1.12.2" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; - sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; - }; - }; - "object-keys-1.1.1" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - }; - "object.assign-4.1.2" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; - sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; - }; - }; - "object.values-1.1.5" = { - name = "object.values"; - packageName = "object.values"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz"; - sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - }; - "onetime-5.1.2" = { - name = "onetime"; - packageName = "onetime"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; - sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; - }; - }; - "optionator-0.3.0" = { - name = "optionator"; - packageName = "optionator"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz"; - sha512 = "qM6AKy0HNNRczFIFciGVSkh6H5yu8kC2hdgqElG8pM6IvQwFYVBd3aUrqjsgZtauuGZr2u/Nf+wLzlZgeCqpSQ=="; - }; - }; - "optionator-0.8.3" = { - name = "optionator"; - packageName = "optionator"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"; - sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; - }; - }; - "optionator-0.9.1" = { - name = "optionator"; - packageName = "optionator"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; - sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; - }; - }; - "ot-builder-1.5.3" = { - name = "ot-builder"; - packageName = "ot-builder"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.3.tgz"; - sha512 = "SLKp4TM/4ZUVLUMKHOVoZajocaC5WmcY9H3r7PIfCbHUQXLfcsRvo3OIo5vcRZLG3dvZ71eoQr9GqSICvaZEcw=="; - }; - }; - "otb-ttc-bundle-1.5.3" = { - name = "otb-ttc-bundle"; - packageName = "otb-ttc-bundle"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.3.tgz"; - sha512 = "Uq2trJQEGM1a8z1C0sNgVS6FxsNP6YLWJD2+bH5K53ARnxXNzEINf0lckmgLLClW/uScALn8OlNXhD7vnbdZ6w=="; - }; - }; - "p-limit-1.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; - }; - }; - "p-locate-2.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha512 = "nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg=="; - }; - }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha512 = "U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww=="; - }; - }; - "parent-module-1.0.1" = { - name = "parent-module"; - packageName = "parent-module"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; - sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; - }; - }; - "passerror-1.1.1" = { - name = "passerror"; - packageName = "passerror"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/passerror/-/passerror-1.1.1.tgz"; - sha512 = "PwrEQJBkJMxnxG+tdraz95vTstYnCRqiURNbGtg/vZHLgcAODc9hbiD5ZumGUoh3bpw0F0qKLje7Vd2Fd5Lx3g=="; - }; - }; - "patel-0.38.0" = { - name = "patel"; - packageName = "patel"; - version = "0.38.0"; - src = fetchurl { - url = "https://registry.npmjs.org/patel/-/patel-0.38.0.tgz"; - sha512 = "Bzhgo3HTG1phko50ULaBEi7wBZxJLgt0BZDJDjdIhSz+ZlhsY6+yDvXAJcXAtTwcqSR4F5j2Yc2Gqkornk9D5A=="; - }; - }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha512 = "bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - }; - "path-key-3.1.1" = { - name = "path-key"; - packageName = "path-key"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - }; - "path-parse-1.0.7" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - }; - "patrisika-0.25.0" = { - name = "patrisika"; - packageName = "patrisika"; - version = "0.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/patrisika/-/patrisika-0.25.0.tgz"; - sha512 = "Kevy01SFkhzON30J1nKVzHPdoJmkmRY2HG+OIFeI/IT4eBveQwbrE3Q2beEx9t02HhMyAlnYFXt0z5wNY6mePA=="; - }; - }; - "patrisika-scopes-0.12.0" = { - name = "patrisika-scopes"; - packageName = "patrisika-scopes"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.12.0.tgz"; - sha512 = "rj428KYq5leS75PCDl6iyl91n6/d63yw1ikHYwd1z9UXwWk11Vj2gpTu0CxjLZJJOiFNA01LiX+WMpC5icCKng=="; - }; - }; - "pegjs-0.10.0" = { - name = "pegjs"; - packageName = "pegjs"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; - sha512 = "qI5+oFNEGi3L5HAxDwN2LA4Gg7irF70Zs25edhjld9QemOgp0CbvMtbFcMvFtEo1OityPrcCzkQFB8JP/hxgow=="; - }; - }; - "prelude-ls-1.1.2" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; - }; - }; - "prelude-ls-1.2.1" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; - }; - }; - "prettier-2.7.1" = { - name = "prettier"; - packageName = "prettier"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"; - sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="; - }; - }; - "punycode-2.1.1" = { - name = "punycode"; - packageName = "punycode"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - }; - "regexp.prototype.flags-1.4.3" = { - name = "regexp.prototype.flags"; - packageName = "regexp.prototype.flags"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; - sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; - }; - }; - "regexpp-3.2.0" = { - name = "regexpp"; - packageName = "regexpp"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"; - sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; - }; - }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; - }; - }; - "resolve-1.22.1" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; - }; - }; - "resolve-from-4.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; - }; - }; - "restore-cursor-3.1.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; - }; - }; - "resumer-0.0.0" = { - name = "resumer"; - packageName = "resumer"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; - sha512 = "Fn9X8rX8yYF4m81rZCK/5VmrmsSbqS/i3rDLl6ZZHAXgC2nTAx3dhwG8q8odP/RmdLa2YrybDJaAMg+X1ajY3w=="; - }; - }; - "rimraf-3.0.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - }; - "safer-buffer-2.1.2" = { - name = "safer-buffer"; - packageName = "safer-buffer"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "semaphore-async-await-1.5.1" = { - name = "semaphore-async-await"; - packageName = "semaphore-async-await"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz"; - sha512 = "b/ptP11hETwYWpeilHXXQiV5UJNJl7ZWWooKRE5eBIYWoom6dZ0SluCIdCtKycsMtZgKWE01/qAw6jblw1YVhg=="; - }; - }; - "semver-7.3.7" = { - name = "semver"; - packageName = "semver"; - version = "7.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; - }; - }; - "seq-0.3.5" = { - name = "seq"; - packageName = "seq"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/seq/-/seq-0.3.5.tgz"; - sha512 = "sisY2Ln1fj43KBkRtXkesnRHYNdswIkIibvNe/0UKm2GZxjMbqmccpiatoKr/k2qX5VKiLU8xm+tz/74LAho4g=="; - }; - }; - "shebang-command-2.0.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - }; - "shebang-regex-3.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - }; - "side-channel-1.0.4" = { - name = "side-channel"; - packageName = "side-channel"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; - }; - }; - "signal-exit-3.0.7" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; - }; - }; - "source-map-0.1.43" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.43"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; - sha512 = "VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ=="; - }; - }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - }; - "spiro-3.0.0" = { - name = "spiro"; - packageName = "spiro"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spiro/-/spiro-3.0.0.tgz"; - sha512 = "UEhtLWA8fDQuExOKpT3FLa7Rk238G5Bm3wGAxbvnah3H2X6yEL4blIkAsc38wNwMXBwQFRYE6l0Q9X0t1izOxA=="; - }; - }; - "string-width-4.2.3" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - }; - "string.prototype.trimend-1.0.5" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; - sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; - }; - }; - "string.prototype.trimstart-1.0.5" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; - sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; - }; - }; - "strip-ansi-6.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="; - }; - }; - "strip-json-comments-3.1.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; - }; - }; - "supports-color-7.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; - }; - }; - "supports-preserve-symlinks-flag-1.0.0" = { - name = "supports-preserve-symlinks-flag"; - packageName = "supports-preserve-symlinks-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - }; - "text-table-0.2.0" = { - name = "text-table"; - packageName = "text-table"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; - }; - }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; - }; - }; - "toposort-2.0.2" = { - name = "toposort"; - packageName = "toposort"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; - sha512 = "0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="; - }; - }; - "traverse-0.3.9" = { - name = "traverse"; - packageName = "traverse"; - version = "0.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; - sha512 = "iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ=="; - }; - }; - "tsconfig-paths-3.14.1" = { - name = "tsconfig-paths"; - packageName = "tsconfig-paths"; - version = "3.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"; - sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; - }; - }; - "tslib-2.4.0" = { - name = "tslib"; - packageName = "tslib"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; - }; - }; - "type-check-0.3.2" = { - name = "type-check"; - packageName = "type-check"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; - }; - }; - "type-check-0.4.0" = { - name = "type-check"; - packageName = "type-check"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; - sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; - }; - }; - "type-fest-0.20.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - }; - "typo-geom-0.12.1" = { - name = "typo-geom"; - packageName = "typo-geom"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.12.1.tgz"; - sha512 = "W20RYp2OCEGMhEYayR0cAP67AUWiGRUufMs6Clul7MAmu5SpLuOG/RWk7+LkL65wsugcfhPQlFEJ231C2xHNQg=="; - }; - }; - "unbox-primitive-1.0.2" = { - name = "unbox-primitive"; - packageName = "unbox-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; - sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; - }; - }; - "unicoderegexp-0.4.1" = { - name = "unicoderegexp"; - packageName = "unicoderegexp"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unicoderegexp/-/unicoderegexp-0.4.1.tgz"; - sha512 = "ydh8D5mdd2ldTS25GtZJEgLciuF0Qf2n3rwPhonELk3HioX201ClYGvZMc1bCmx6nblZiADQwbMWekeIqs51qw=="; - }; - }; - "universalify-2.0.0" = { - name = "universalify"; - packageName = "universalify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - }; - "uri-js-4.4.1" = { - name = "uri-js"; - packageName = "uri-js"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; - sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; - }; - }; - "uuid-8.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - }; - "v8-compile-cache-2.3.0" = { - name = "v8-compile-cache"; - packageName = "v8-compile-cache"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; - sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; - }; - }; - "verda-1.10.0" = { - name = "verda"; - packageName = "verda"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.10.0.tgz"; - sha512 = "euo21L72IMCzrQ9GrYGEI1kmQT6bgKcfJaa0zr4a+FpODsOrszDk55SYsvAqKUMzgXJHAGh4LvE9ytu45E79OA=="; - }; - }; - "wawoff2-2.0.1" = { - name = "wawoff2"; - packageName = "wawoff2"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wawoff2/-/wawoff2-2.0.1.tgz"; - sha512 = "r0CEmvpH63r4T15ebFqeOjGqU4+EgTx4I510NtK35EMciSdcTxCw3Byy3JnBonz7iyIFZ0AbVo0bbFpEVuhCYA=="; - }; - }; - "which-2.0.2" = { - name = "which"; - packageName = "which"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; - sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; - }; - }; - "which-boxed-primitive-1.0.2" = { - name = "which-boxed-primitive"; - packageName = "which-boxed-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; - }; - }; - "word-wrap-1.2.3" = { - name = "word-wrap"; - packageName = "word-wrap"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; - sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - }; - "wordwrap-0.0.3" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha512 = "1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw=="; - }; - }; - "wrap-ansi-7.0.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - }; - "xpath-0.0.32" = { - name = "xpath"; - packageName = "xpath"; - version = "0.0.32"; - src = fetchurl { - url = "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz"; - sha512 = "rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw=="; - }; - }; - "y18n-5.0.8" = { - name = "y18n"; - packageName = "y18n"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; - sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; - }; - }; - "yallist-4.0.0" = { - name = "yallist"; - packageName = "yallist"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - }; - "yargs-16.2.0" = { - name = "yargs"; - packageName = "yargs"; - version = "16.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; - sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; - }; - }; - "yargs-17.5.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz"; - sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; - }; - }; - "yargs-parser-20.2.9" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "20.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; - }; - }; - "yargs-parser-21.0.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "21.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"; - sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; - }; - }; - }; - args = { - name = "iosevka"; - packageName = "iosevka"; - version = "15.6.3"; - src = ./.; - dependencies = [ - sources."@eslint/eslintrc-1.3.0" - sources."@humanwhocodes/config-array-0.9.5" - sources."@humanwhocodes/object-schema-1.2.1" - sources."@iarna/toml-2.2.5" - sources."@msgpack/msgpack-2.7.2" - sources."@ot-builder/bin-composite-types-1.5.3" - sources."@ot-builder/bin-util-1.5.3" - sources."@ot-builder/cli-help-shower-1.5.3" - sources."@ot-builder/cli-proc-1.5.3" - sources."@ot-builder/cli-shared-1.5.3" - sources."@ot-builder/common-impl-1.5.3" - sources."@ot-builder/errors-1.5.3" - sources."@ot-builder/io-bin-cff-1.5.3" - sources."@ot-builder/io-bin-encoding-1.5.3" - sources."@ot-builder/io-bin-ext-private-1.5.3" - sources."@ot-builder/io-bin-font-1.5.3" - sources."@ot-builder/io-bin-glyph-store-1.5.3" - sources."@ot-builder/io-bin-layout-1.5.3" - sources."@ot-builder/io-bin-metadata-1.5.3" - sources."@ot-builder/io-bin-metric-1.5.3" - sources."@ot-builder/io-bin-name-1.5.3" - sources."@ot-builder/io-bin-sfnt-1.5.3" - sources."@ot-builder/io-bin-ttf-1.5.3" - sources."@ot-builder/io-bin-vtt-private-1.5.3" - sources."@ot-builder/ot-1.5.3" - sources."@ot-builder/ot-encoding-1.5.3" - sources."@ot-builder/ot-ext-private-1.5.3" - sources."@ot-builder/ot-glyphs-1.5.3" - sources."@ot-builder/ot-layout-1.5.3" - sources."@ot-builder/ot-metadata-1.5.3" - sources."@ot-builder/ot-name-1.5.3" - sources."@ot-builder/ot-sfnt-1.5.3" - sources."@ot-builder/ot-standard-glyph-namer-1.5.3" - sources."@ot-builder/ot-vtt-private-1.5.3" - sources."@ot-builder/prelude-1.5.3" - sources."@ot-builder/primitive-1.5.3" - sources."@ot-builder/rectify-1.5.3" - sources."@ot-builder/stat-glyphs-1.5.3" - sources."@ot-builder/trace-1.5.3" - sources."@ot-builder/var-store-1.5.3" - sources."@ot-builder/variance-1.5.3" - sources."@types/json5-0.0.29" - sources."@unicode/unicode-14.0.0-1.2.2" - sources."@xmldom/xmldom-0.8.2" - sources."acorn-8.7.1" - sources."acorn-jsx-5.3.2" - sources."aglfn-1.0.2" - sources."ajv-6.12.6" - sources."amdefine-1.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."array-includes-3.1.5" - sources."array.prototype.flat-1.3.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - sources."chainsaw-0.0.9" - sources."chalk-4.1.2" - sources."cldr-7.2.0" - sources."cli-cursor-3.1.0" - sources."clipper-lib-6.4.2" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."cross-spawn-7.0.3" - sources."debug-4.3.4" - sources."deep-is-0.1.4" - sources."define-properties-1.1.4" - sources."doctrine-3.0.0" - sources."emoji-regex-8.0.0" - sources."es-abstract-1.20.1" - sources."es-shim-unscopables-1.0.0" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-string-regexp-4.0.0" - sources."escodegen-2.0.0" - (sources."escope-1.0.3" // { - dependencies = [ - sources."estraverse-2.0.0" - ]; - }) - (sources."eslint-8.18.0" // { - dependencies = [ - sources."optionator-0.9.1" - ]; - }) - sources."eslint-config-prettier-8.5.0" - (sources."eslint-import-resolver-node-0.3.6" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-module-utils-2.7.3" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-plugin-import-2.26.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."doctrine-2.1.0" - sources."ms-2.0.0" - ]; - }) - sources."eslint-scope-7.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) - sources."eslint-visitor-keys-3.3.0" - (sources."esmangle-1.0.1" // { - dependencies = [ - sources."escodegen-1.3.3" - sources."esprima-1.1.1" - sources."estraverse-1.5.1" - sources."esutils-1.0.0" - sources."fast-levenshtein-1.0.7" - sources."levn-0.2.5" - sources."optionator-0.3.0" - sources."prelude-ls-1.1.2" - sources."source-map-0.1.43" - sources."type-check-0.3.2" - ]; - }) - sources."espree-9.3.2" - sources."esprima-4.0.1" - sources."esquery-1.4.0" - sources."esrecurse-4.3.0" - (sources."esshorten-1.1.1" // { - dependencies = [ - sources."estraverse-4.1.1" - ]; - }) - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."file-entry-cache-6.0.1" - sources."find-up-2.1.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.5" - sources."fs-extra-10.1.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functional-red-black-tree-1.0.1" - sources."functions-have-names-1.2.3" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.2" - sources."get-symbol-description-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-6.0.2" - sources."globals-13.15.0" - sources."graceful-fs-4.2.10" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hashish-0.0.4" - sources."iconv-lite-0.6.3" - sources."ignore-5.2.0" - sources."import-fresh-3.3.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."internal-slot-1.0.3" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.4" - sources."is-core-module-2.9.0" - sources."is-date-object-1.0.5" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-negative-zero-2.0.2" - sources."is-number-object-1.0.7" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.2" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-weakref-1.0.2" - sources."isexe-2.0.0" - sources."js-yaml-4.1.0" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-1.0.1" - sources."jsonfile-6.1.0" - sources."levn-0.4.1" - sources."locate-path-2.0.0" - sources."lodash.merge-4.6.2" - sources."lru-cache-2.5.0" - sources."memoizeasync-1.1.0" - sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.6" - sources."ms-2.1.2" - sources."natural-compare-1.4.0" - sources."object-inspect-1.12.2" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" - sources."object.values-1.1.5" - sources."once-1.4.0" - sources."onetime-5.1.2" - (sources."optionator-0.8.3" // { - dependencies = [ - sources."levn-0.3.0" - sources."prelude-ls-1.1.2" - sources."type-check-0.3.2" - ]; - }) - sources."ot-builder-1.5.3" - sources."otb-ttc-bundle-1.5.3" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."parent-module-1.0.1" - sources."passerror-1.1.1" - sources."patel-0.38.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."patrisika-0.25.0" - sources."patrisika-scopes-0.12.0" - sources."pegjs-0.10.0" - sources."prelude-ls-1.2.1" - sources."prettier-2.7.1" - sources."punycode-2.1.1" - sources."regexp.prototype.flags-1.4.3" - sources."regexpp-3.2.0" - sources."require-directory-2.1.1" - sources."resolve-1.22.1" - sources."resolve-from-4.0.0" - sources."restore-cursor-3.1.0" - sources."resumer-0.0.0" - sources."rimraf-3.0.2" - sources."safer-buffer-2.1.2" - sources."semaphore-async-await-1.5.1" - (sources."semver-7.3.7" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."seq-0.3.5" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."source-map-0.6.1" - sources."spiro-3.0.0" - sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" - sources."strip-ansi-6.0.1" - sources."strip-bom-3.0.0" - sources."strip-json-comments-3.1.1" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."text-table-0.2.0" - sources."through-2.3.8" - sources."toposort-2.0.2" - sources."traverse-0.3.9" - sources."tsconfig-paths-3.14.1" - sources."tslib-2.4.0" - sources."type-check-0.4.0" - sources."type-fest-0.20.2" - sources."typo-geom-0.12.1" - sources."unbox-primitive-1.0.2" - sources."unicoderegexp-0.4.1" - sources."universalify-2.0.0" - sources."uri-js-4.4.1" - sources."uuid-8.3.2" - sources."v8-compile-cache-2.3.0" - (sources."verda-1.10.0" // { - dependencies = [ - sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" - ]; - }) - sources."wawoff2-2.0.1" - sources."which-2.0.2" - sources."which-boxed-primitive-1.0.2" - sources."word-wrap-1.2.3" - sources."wordwrap-0.0.3" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."xpath-0.0.32" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - }; - production = false; - bypassCache = true; - reconstructLock = false; - }; -in -{ - args = args; - sources = sources; - tarball = nodeEnv.buildNodeSourceDist args; - package = nodeEnv.buildNodePackage args; - shell = nodeEnv.buildNodeShell args; - nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { - src = stdenv.mkDerivation { - name = args.name + "-package-json"; - src = nix-gitignore.gitignoreSourcePure [ - "*" - "!package.json" - "!package-lock.json" - ] args.src; - dontBuild = true; - installPhase = "mkdir -p $out; cp -r ./* $out;"; - }; - }); -} diff --git a/pkgs/data/fonts/iosevka/update-default.sh b/pkgs/data/fonts/iosevka/update-default.sh deleted file mode 100755 index 8d918058988a..000000000000 --- a/pkgs/data/fonts/iosevka/update-default.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts coreutils gawk replace -set -euo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" - -nixpkgs=../../../.. -repo=https://github.com/be5invis/Iosevka - -# Discover the latest version. -current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"') -new_version=$(list-git-tags --url="$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') -if [[ "$new_version" == "$current_version" ]]; then - echo "iosevka: no update found" - exit -fi - -# Update the source package in nodePackages. -current_source="$repo/archive/v$current_version.tar.gz" -new_source="$repo/archive/v$new_version.tar.gz" -replace-literal -ef "$current_source" "$new_source" ../../../development/node-packages/node-packages.json -echo "iosevka: $current_version -> $new_version (after nodePackages update)" diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c687e763c284..5869a0e1726a 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -183,7 +183,6 @@ , "insect" , "intelephense" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v15.6.3.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" From d90de5e19b9f0c3df4b3ad44be71888cbdbcff36 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Mon, 30 Jan 2023 13:33:16 +0000 Subject: [PATCH 31/49] iosevka: update homepage and description --- pkgs/data/fonts/iosevka/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 05acabb08524..5aa19b24bf91 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -116,11 +116,12 @@ buildNpmPackage rec { enableParallelBuilding = true; meta = with lib; { - homepage = "https://be5invis.github.io/Iosevka"; + homepage = "https://typeof.net/Iosevka/"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; description = '' - Slender monospace sans-serif and slab-serif typeface inspired by Pragmata - Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. + Iosevka is an open-source, sans-serif + slab-serif, monospace + + quasi‑proportional typeface family, designed for writing code, using in + terminals, and preparing technical documents. ''; license = licenses.ofl; platforms = platforms.all; From 08d6f00328bfcbc0a241e507927f4acec3d3baec Mon Sep 17 00:00:00 2001 From: lunik1 Date: Mon, 30 Jan 2023 13:33:43 +0000 Subject: [PATCH 32/49] iosevka: format with nixpkgs-fmt --- pkgs/data/fonts/iosevka/default.nix | 34 ++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 5aa19b24bf91..53a54f346db1 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -48,7 +48,8 @@ # ''; , extraParameters ? null # Custom font set name. Required if any custom settings above. -, set ? null }: +, set ? null +}: assert (privateBuildPlan != null) -> set != null; assert (extraParameters != null) -> set != null; @@ -69,28 +70,31 @@ buildNpmPackage rec { nativeBuildInputs = [ nodejs remarshal ttfautohint-nox ]; buildPlan = - if builtins.isAttrs privateBuildPlan - then builtins.toJSON { buildPlans.${pname} = privateBuildPlan; } - else privateBuildPlan; + if builtins.isAttrs privateBuildPlan then + builtins.toJSON { buildPlans.${pname} = privateBuildPlan; } + else + privateBuildPlan; inherit extraParameters; - passAsFile = [ - "extraParameters" - ] ++ lib.optionals (! (builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)) [ - "buildPlan" - ]; + passAsFile = [ "extraParameters" ] ++ lib.optionals + ( + !(builtins.isString privateBuildPlan + && lib.hasPrefix builtins.storeDir privateBuildPlan) + ) [ "buildPlan" ]; configurePhase = '' runHook preConfigure ${lib.optionalString (builtins.isAttrs privateBuildPlan) '' remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml ''} - ${lib.optionalString (builtins.isString privateBuildPlan && (!lib.hasPrefix builtins.storeDir privateBuildPlan)) '' - cp "$buildPlanPath" private-build-plans.toml - ''} - ${lib.optionalString (builtins.isString privateBuildPlan && (lib.hasPrefix builtins.storeDir privateBuildPlan)) '' - cp "$buildPlan" private-build-plans.toml - ''} + ${lib.optionalString (builtins.isString privateBuildPlan + && (!lib.hasPrefix builtins.storeDir privateBuildPlan)) '' + cp "$buildPlanPath" private-build-plans.toml + ''} + ${lib.optionalString (builtins.isString privateBuildPlan + && (lib.hasPrefix builtins.storeDir privateBuildPlan)) '' + cp "$buildPlan" private-build-plans.toml + ''} ${lib.optionalString (extraParameters != null) '' echo -e "\n" >> params/parameters.toml cat "$extraParametersPath" >> params/parameters.toml From 10b24321c67e31fde6a8e4ea2ee59a64d4c156e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Jan 2023 17:00:55 +0000 Subject: [PATCH 33/49] rpcs3: 0.0.26-14599-d3183708e -> 0.0.26-14637-c471120a8 --- pkgs/applications/emulators/rpcs3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 93d7a58e3cf4..a97114a07a57 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14599-d3183708e"; - rpcs3Version = "0.0.26-14599-d3183708e"; - rpcs3Revision = "d3183708e81ba2707d39829cc1c0cb226dd9e50e"; - rpcs3Sha256 = "0lx9v614r9afmfknw9qdwawwayg3z0fj6chbhnfghm2j2zgqqbpi"; + rpcs3GitVersion = "14637-c471120a8"; + rpcs3Version = "0.0.26-14637-c471120a8"; + rpcs3Revision = "c471120a80ec6f12cd4489e1a9be073d7d9c96f2"; + rpcs3Sha256 = "1fl7zarxbjaz6mi3lqv55kdwpvjfz8d02qfl0655zihwm6zzdny5"; ittapi = fetchFromGitHub { owner = "intel"; From 6ff66fcbd70c7d588bbf6e3b2cd41aa7d8a62fd2 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Mon, 30 Jan 2023 21:22:02 +0000 Subject: [PATCH 34/49] lib: standardise attrset type syntax There are a number of different syntaxes used for attrset type signatures in our doc strings, this change standardises upon one that uses :: for specifying attribute type, and ; terminators to be consistent with nix syntax. There are no bugs in the functions themselves, just that different syntaxes may confuse new users. --- lib/attrsets.nix | 10 +++++----- lib/lists.nix | 4 ++-- lib/options.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 1a51225a80ed..30952651adf4 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -168,7 +168,7 @@ rec { ] { a.b.c = 0; } => { a = { b = { d = 1; }; }; x = { y = "xy"; }; } - Type: updateManyAttrsByPath :: [{ path :: [String], update :: (Any -> Any) }] -> AttrSet -> AttrSet + Type: updateManyAttrsByPath :: [{ path :: [String]; update :: (Any -> Any); }] -> AttrSet -> AttrSet */ updateManyAttrsByPath = let # When recursing into attributes, instead of updating the `path` of each @@ -414,7 +414,7 @@ rec { => { name = "some"; value = 6; } Type: - nameValuePair :: String -> Any -> { name :: String, value :: Any } + nameValuePair :: String -> Any -> { name :: String; value :: Any; } */ nameValuePair = # Attribute name @@ -449,7 +449,7 @@ rec { => { foo_x = "bar-a"; foo_y = "bar-b"; } Type: - mapAttrs' :: (String -> Any -> { name = String; value = Any }) -> AttrSet -> AttrSet + mapAttrs' :: (String -> Any -> { name :: String; value :: Any; }) -> AttrSet -> AttrSet */ mapAttrs' = # A function, given an attribute's name and value, returns a new `nameValuePair`. @@ -649,7 +649,7 @@ rec { Example: zipAttrsWith (name: values: values) [{a = "x";} {a = "y"; b = "z";}] - => { a = ["x" "y"]; b = ["z"] } + => { a = ["x" "y"]; b = ["z"]; } Type: zipAttrsWith :: (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet @@ -664,7 +664,7 @@ rec { Example: zipAttrs [{a = "x";} {a = "y"; b = "z";}] - => { a = ["x" "y"]; b = ["z"] } + => { a = ["x" "y"]; b = ["z"]; } Type: zipAttrs :: [ AttrSet ] -> AttrSet diff --git a/lib/lists.nix b/lib/lists.nix index 8b2c2d12801b..9f69485b4086 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -306,7 +306,7 @@ rec { /* Splits the elements of a list in two lists, `right` and `wrong`, depending on the evaluation of a predicate. - Type: (a -> bool) -> [a] -> { right :: [a], wrong :: [a] } + Type: (a -> bool) -> [a] -> { right :: [a]; wrong :: [a]; } Example: partition (x: x > 2) [ 5 1 2 3 4 ] @@ -374,7 +374,7 @@ rec { /* Merges two lists of the same size together. If the sizes aren't the same the merging stops at the shortest. - Type: zipLists :: [a] -> [b] -> [{ fst :: a, snd :: b}] + Type: zipLists :: [a] -> [b] -> [{ fst :: a; snd :: b; }] Example: zipLists [ 1 2 ] [ "a" "b" ] diff --git a/lib/options.nix b/lib/options.nix index ce66bfb9d5d9..d14d209a8347 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -114,7 +114,7 @@ rec { You can omit the default path if the name of the option is also attribute path in nixpkgs. - Type: mkPackageOption :: pkgs -> string -> { default :: [string], example :: null | string | [string] } -> option + Type: mkPackageOption :: pkgs -> string -> { default :: [string]; example :: null | string | [string]; } -> option Example: mkPackageOption pkgs "hello" { } @@ -201,7 +201,7 @@ rec { /* Extracts values of all "value" keys of the given list. - Type: getValues :: [ { value :: a } ] -> [a] + Type: getValues :: [ { value :: a; } ] -> [a] Example: getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ] @@ -211,7 +211,7 @@ rec { /* Extracts values of all "file" keys of the given list - Type: getFiles :: [ { file :: a } ] -> [a] + Type: getFiles :: [ { file :: a; } ] -> [a] Example: getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ] From d18eea69350a28cbce748c05b5fe03a465dfbd94 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 29 Jan 2023 22:59:57 +0000 Subject: [PATCH 35/49] paperless-ngx: Build frontend from source --- .../office/paperless-ngx/default.nix | 79 +++++++++++++++---- 1 file changed, 62 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index c87e54e09154..7a49cf6e960a 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -1,6 +1,8 @@ { lib -, fetchurl +, fetchFromGitHub +, buildNpmPackage , nixosTests +, gettext , python3 , ghostscript , imagemagickBig @@ -12,10 +14,18 @@ , unpaper , poppler_utils , liberation_ttf -, fetchFromGitHub }: let + version = "1.11.3"; + + src = fetchFromGitHub { + owner = "paperless-ngx"; + repo = "paperless-ngx"; + rev = "refs/tags/v${version}"; + hash = "sha256-d1O8bAXB7NPymibagWUgMDZ9LAZ6QpawmT5D5yw4j+w="; + }; + # Use specific package versions required by paperless-ngx python = python3.override { packageOverrides = self: super: { @@ -78,20 +88,47 @@ let unpaper poppler_utils ]; -in -python.pkgs.pythonPackages.buildPythonApplication rec { - pname = "paperless-ngx"; - version = "1.11.3"; - # Fetch the release tarball instead of a git ref because it contains the prebuilt frontend - src = fetchurl { - url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; - hash = "sha256-wGNkdczgV+UDd9ZO+BXMSWotpetE/+c/jJAAH+6SXps="; + frontend = buildNpmPackage { + pname = "paperless-ngx-frontend"; + inherit version src; + + npmDepsHash = "sha256-ZjIWU8i2Riz4KmC1Woi0uaJ+uNyuU27XwFqvo4bCC5k="; + + nativeBuildInputs = [ + python3 + ]; + + postPatch = '' + cd src-ui + ''; + + CYPRESS_INSTALL_BINARY = "0"; + NG_CLI_ANALYTICS = "false"; + + npmBuildFlags = [ + "--" "--configuration" "production" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/paperless-ui + mv ../src/documents/static/frontend $out/lib/paperless-ui/ + runHook postInstall + ''; }; - +in +python.pkgs.buildPythonApplication rec { + pname = "paperless-ngx"; format = "other"; - propagatedBuildInputs = with python.pkgs.pythonPackages; [ + inherit version src; + + nativeBuildInputs = [ + gettext + ]; + + propagatedBuildInputs = with python.pkgs; [ aioredis arrow asgiref @@ -192,15 +229,23 @@ python.pkgs.pythonPackages.buildPythonApplication rec { zope_interface ]; - # Compile manually because `pythonRecompileBytecodeHook` only works for - # files in `python.sitePackages` + postBuild = '' + # Compile manually because `pythonRecompileBytecodeHook` only works + # for files in `python.sitePackages` ${python.interpreter} -OO -m compileall src + + # Collect static files + ${python.interpreter} src/manage.py collectstatic --clear --no-input + + # Compile string translations using gettext + ${python.interpreter} src/manage.py compilemessages ''; installPhase = '' - mkdir -p $out/lib - cp -r . $out/lib/paperless-ngx + mkdir -p $out/lib/paperless-ngx + cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx + ln -s ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/ chmod +x $out/lib/paperless-ngx/src/manage.py makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ --prefix PYTHONPATH : "$PYTHONPATH" \ @@ -250,7 +295,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { ]; passthru = { - inherit python path; + inherit python path frontend; tests = { inherit (nixosTests) paperless; }; }; From 7018ef588677057eae83b611fd63bc6ebcd4b3ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Jan 2023 02:35:34 +0100 Subject: [PATCH 36/49] python3Packages.redis: fix hiredis extra name --- pkgs/development/python-modules/redis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 649a1192afd0..d16cff4f9280 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - hidredis = [ + hiredis = [ hiredis ]; ocsp = [ From 1b3a601be2c06913a48d65992df61da8ef370ffc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Jan 2023 02:37:00 +0100 Subject: [PATCH 37/49] paperless-ngx: 1.11.3 -> 1.12.2 https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.12.0 https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.12.1 https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.12.2 --- .../office/paperless-ngx/default.nix | 50 ++++++++++++------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 7a49cf6e960a..28314d48fe51 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -17,13 +17,13 @@ }: let - version = "1.11.3"; + version = "1.12.2"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-d1O8bAXB7NPymibagWUgMDZ9LAZ6QpawmT5D5yw4j+w="; + hash = "sha256-1QufnRD2Nbc4twRZ4Yrf3ae1BRGves8tJ/M7coWnRPI="; }; # Use specific package versions required by paperless-ngx @@ -93,7 +93,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-ZjIWU8i2Riz4KmC1Woi0uaJ+uNyuU27XwFqvo4bCC5k="; + npmDepsHash = "sha256-fp0Gy3018u2y6jaUM9bmXU0SVjyEJdsvkBqbmb8S10Y="; nativeBuildInputs = [ python3 @@ -130,21 +130,25 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ aioredis - arrow + amqp + anyio asgiref async-timeout attrs autobahn automat + billiard bleach - blessed celery certifi cffi channels-redis channels - chardet + charset-normalizer click + click-didyoumean + click-plugins + click-repl coloredlogs concurrent-log-handler constantly @@ -155,18 +159,16 @@ python.pkgs.buildPythonApplication rec { django-cors-headers django-extensions django-filter - django-picklefield django djangorestframework filelock - fuzzywuzzy gunicorn h11 hiredis httptools humanfriendly + humanize hyperlink - imagehash idna imap-tools img2pdf @@ -177,9 +179,11 @@ python.pkgs.buildPythonApplication rec { langdetect lxml msgpack + mysqlclient nltk numpy ocrmypdf + packaging pathvalidate pdf2image pdfminer-six @@ -187,6 +191,7 @@ python.pkgs.buildPythonApplication rec { pillow pluggy portalocker + prompt-toolkit psycopg2 pyasn1-modules pyasn1 @@ -195,7 +200,6 @@ python.pkgs.buildPythonApplication rec { python-dateutil python-dotenv python-gnupg - levenshtein python-magic pytz pyyaml @@ -208,27 +212,34 @@ python.pkgs.buildPythonApplication rec { scikit-learn scipy service-identity - six - sortedcontainers + setproctitle + sniffio sqlparse threadpoolctl tika + tornado tqdm - twisted.optional-dependencies.tls + twisted txaio + tzdata tzlocal urllib3 uvicorn uvloop + vine watchdog - watchgod + watchfiles wcwidth + webencodings websockets whitenoise whoosh + zipp zope_interface - ]; - + ] + ++ redis.optional-dependencies.hiredis + ++ twisted.optional-dependencies.tls + ++ uvicorn.optional-dependencies.standard; postBuild = '' # Compile manually because `pythonRecompileBytecodeHook` only works @@ -255,12 +266,12 @@ python.pkgs.buildPythonApplication rec { --prefix PATH : "${path}" ''; - nativeCheckInputs = with python.pkgs.pythonPackages; [ + nativeCheckInputs = with python.pkgs; [ + factory_boy + imagehash pytest-django pytest-env - pytest-sugar pytest-xdist - factory_boy pytestCheckHook ]; @@ -302,6 +313,7 @@ python.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to scan, index, and archive all of your physical documents"; homepage = "https://paperless-ngx.readthedocs.io/"; + changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ lukegb gador erikarvstedt ]; }; From 4fc0f24120eec931c5c7ea95dcfad327563c048f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Jan 2023 18:52:21 +0100 Subject: [PATCH 38/49] paperless-ngx: Reduce output size By dropping the tests and its assets we further reduce the output size from 23M to just 8.4M. --- pkgs/applications/office/paperless-ngx/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 28314d48fe51..61c607c422e8 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -266,6 +266,11 @@ python.pkgs.buildPythonApplication rec { --prefix PATH : "${path}" ''; + postFixup = '' + # Remove tests with samples (~14M) + find $out/lib/paperless-ngx -type d -name tests -exec rm -rv {} + + ''; + nativeCheckInputs = with python.pkgs; [ factory_boy imagehash From 6616e69312ec69c0c7246e6cb150928f662466b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Jan 2023 11:08:00 +0000 Subject: [PATCH 39/49] praat: 6.3.04 -> 6.3.05 --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 323a83c4ca9b..519f59a1d89d 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.3.04"; + version = "6.3.05"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-C5wDiqoS6dF8VGTqiQbr1obtjpsiIa2bmtF6qGYc8XQ="; + sha256 = "sha256-0e225cmP0CSYjRYNEXi4Oqq9o8XR2N7bNS1X5x+mQKw="; }; configurePhase = '' From f9a1d83cdbf4154b71bf2eb817c94060b304929b Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 26 Jan 2023 10:28:22 +0100 Subject: [PATCH 40/49] criu: support cross-compile for armv7l and aarch64 This fixes the `criu` package to support cross-compilation to armv7l and aarch64 architectures (tested on an x86 build host). `criu` requires some additional flags to be passed to its Makefile infrastructure to hint at the target architecture. It further requires a few dependencies to be executed on the build host, hence moving them to `depsBuildBuild`. Signed-off-by: Leon Schuermann --- pkgs/os-specific/linux/criu/default.nix | 59 ++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 5475a565b09b..71bde6220a02 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,6 +1,8 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, protobuf, protobufc, asciidoc, iptables , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config, iproute2 -, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd }: +, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd +, buildPackages +}: stdenv.mkDerivation rec { pname = "criu"; @@ -22,9 +24,34 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython perl ]; - buildInputs = [ protobuf asciidoc xmlto libpaper libnl libcap libnet nftables libbsd ]; - propagatedBuildInputs = [ protobufc ] ++ (with python3.pkgs; [ python python3.pkgs.protobuf ]); + depsBuildBuild = [ protobufc buildPackages.stdenv.cc ]; + nativeBuildInputs = [ + pkg-config + asciidoc + xmlto + libpaper + docbook_xsl + which + makeWrapper + docbook_xml_dtd_45 + python3 + python3.pkgs.wrapPython + perl + ]; + buildInputs = [ + protobuf + libnl + libcap + libnet + nftables + libbsd + ]; + propagatedBuildInputs = [ + protobufc + ] ++ (with python3.pkgs; [ + python + python3.pkgs.protobuf + ]); postPatch = '' substituteInPlace ./Documentation/Makefile \ @@ -34,7 +61,27 @@ stdenv.mkDerivation rec { ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; - makeFlags = [ "PREFIX=$(out)" "ASCIIDOC=${asciidoc}/bin/asciidoc" "XMLTO=${xmlto}/bin/xmlto" ]; + makeFlags = let + # criu's Makefile infrastructure expects to be passed a target architecture + # which neither matches the config-tuple's first part, nor the + # targetPlatform.linuxArch attribute. Thus we take the latter and map it + # onto the expected string: + linuxArchMapping = { + "x86_64" = "x86"; + "arm" = "arm"; + "arm64" = "aarch64"; + "powerpc" = "ppc64"; + "s390" = "s390"; + "mips" = "mips"; + }; + in [ + "PREFIX=$(out)" + "ASCIIDOC=${buildPackages.asciidoc}/bin/asciidoc" + "XMLTO=${buildPackages.xmlto}/bin/xmlto" + ] ++ (lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ + "ARCH=${linuxArchMapping."${stdenv.targetPlatform.linuxArch}"}" + "CROSS_COMPILE=${stdenv.targetPlatform.config}-" + ]); outputs = [ "out" "dev" "man" ]; @@ -58,7 +105,7 @@ stdenv.mkDerivation rec { description = "Userspace checkpoint/restore for Linux"; homepage = "https://criu.org"; license = licenses.gpl2; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; maintainers = [ maintainers.thoughtpolice ]; }; } From 870c44295afdcbd979d27f288a39487f4f6a903a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Jan 2023 11:19:04 +0000 Subject: [PATCH 41/49] t-rec: 0.7.5 -> 0.7.6 --- pkgs/misc/t-rec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index e138a62e39aa..2bbfeda4d321 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/misc/t-rec/default.nix @@ -9,13 +9,13 @@ let in rustPlatform.buildRustPackage rec { pname = "t-rec"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "sassman"; repo = "t-rec-rs"; rev = "v${version}"; - sha256 = "sha256-tkt0XAofBhHytbA24g0+jU13aNjmgQ5RspbLTPclnrI="; + sha256 = "sha256-o1fO0N65L6Z6W6aBNhS5JqDHIc1MRQx0yECGzVSCsbo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" ''; - cargoSha256 = "sha256-bb0fwz0fI6DJWgnW0rX63qH2niCLtPeVKex7m6BhVWs="; + cargoHash = "sha256-3NExPlHNcoYVkpOzWCyd66chJpeDzQLRJUruSLAwGNw="; meta = with lib; { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; From b52ae04b634f585e01ff60e18e00a52722969e4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Jan 2023 11:56:17 +0000 Subject: [PATCH 42/49] glooctl: 1.13.3 -> 1.13.4 --- pkgs/applications/networking/cluster/glooctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 5f8781665f4c..5c47c602c33f 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.3"; + version = "1.13.4"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-nxClmCY/joLJw87IQx9DvAZLv5LgOLGlp9Unh37OKgg="; + hash = "sha256-eyfMWum1fZUq4iF77Q+0FP2Rdq2P+xK0au3ytN8MS+k="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorHash = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ="; + vendorHash = "sha256-sQv6g0Xgs+6jgxacWJwE3dK3GimfiPHly0Z0rvdKNE4="; nativeBuildInputs = [ installShellFiles ]; From c4597fef1d0a0cde255f75754382f6311edcefa4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 31 Jan 2023 14:55:11 +0200 Subject: [PATCH 43/49] deterministic-uname: add missing whitespace --- pkgs/build-support/deterministic-uname/deterministic-uname.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/deterministic-uname/deterministic-uname.sh b/pkgs/build-support/deterministic-uname/deterministic-uname.sh index 134bd467bce3..5272bb5b3fe1 100644 --- a/pkgs/build-support/deterministic-uname/deterministic-uname.sh +++ b/pkgs/build-support/deterministic-uname/deterministic-uname.sh @@ -133,7 +133,7 @@ fi # NixOS: # Linux *nodename* 6.0.13 #1-NixOS SMP PREEMPT_DYNAMIC Wed Dec 14 10:41:06 UTC 2022 x86_64 GNU/Linux if [[ "$all" = "1" ]]; then - echo -n "$KERNEL_NAME_VAL $NODENAME_VAL $KERNEL_RELEASE_VAL $KERNEL_VERSION_VAL $MACHINE_VAL" + echo -n "$KERNEL_NAME_VAL $NODENAME_VAL $KERNEL_RELEASE_VAL $KERNEL_VERSION_VAL $MACHINE_VAL " # in help: except omit -p and -i if unknown. #echo -n "$PROCESSOR_VAL $HARDWARE_PLATFORM_VAL\n" echo -n "$OPERATING_SYSTEM_VAL" From eb7c0a38dbcd494e53ef93c3b500194b77bd2d4a Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Tue, 31 Jan 2023 14:42:04 +0100 Subject: [PATCH 44/49] goreleaser: 1.14.1 -> 1.15.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index ad7704d5d409..cb53f4517377 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kA+7kAFAAZngbub2gHoiqEcSkcbxv0DPqbAT3MDBHtI="; + sha256 = "sha256-JVvkASYNp6GSCEIWfZwZ1rtOkUCutccOWCkt47rmgyE="; }; - vendorSha256 = "sha256-v3ZF2WDp4EmHA8RnP39o21cy9+n4cKkKZ0gSowv4nvk="; + vendorSha256 = "sha256-jFItDgmjjKbmTpOn32V1K3AmYyYCrc5RqMAH/X+VWTM="; ldflags = [ "-s" From a7d112b30a36fd4f0500fed41c62249461624c98 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 30 Jan 2023 20:20:16 +0100 Subject: [PATCH 45/49] nixos/paperless: Reindex documents after updating to 1.12.x This causes a reindex of all documents to allow for comments made before 1.12.x to be searchable. Also change the format of the version file to just include the version, not the whole store path. This simplifies version comparisons and causes migrations to run only when the version has changed. Co-Authored-By: Martin Weinelt --- nixos/modules/services/misc/paperless.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 1dddd147ac09..667f16d98f82 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -226,9 +226,26 @@ in # Auto-migrate on first run or if the package has changed versionFile="${cfg.dataDir}/src-version" - if [[ $(cat "$versionFile" 2>/dev/null) != ${pkg} ]]; then + version=$(cat "$versionFile" 2>/dev/null || echo 0) + + if [[ $version != ${pkg.version} ]]; then ${pkg}/bin/paperless-ngx migrate - echo ${pkg} > "$versionFile" + + # Parse old version string format for backwards compatibility + version=$(echo "$version" | grep -ohP '[^-]+$') + + versionLessThan() { + target=$1 + [[ $({ echo "$version"; echo "$target"; } | sort -V | head -1) != "$target" ]] + } + + if versionLessThan 1.12.0; then + # Reindex documents as mentioned in https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.12.1 + echo "Reindexing documents, to allow searching old comments. Required after the 1.12.x upgrade." + ${pkg}/bin/paperless-ngx document_index reindex + fi + + echo ${pkg.version} > "$versionFile" fi '' + optionalString (cfg.passwordFile != null) '' From 48ecda096288c2d1a7c9eb5cca1cedc54afd7223 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jan 2023 21:02:50 +0300 Subject: [PATCH 46/49] nixos/chrony: disable PrivateDevices setting --- nixos/modules/services/networking/ntp/chrony.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index dc180d4a4f95..69f0b36bf2a2 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -185,7 +185,7 @@ in ProtectSystem = "full"; ProtectHome = true; PrivateTmp = true; - PrivateDevices = true; + PrivateDevices = false; PrivateUsers = false; ProtectHostname = true; ProtectClock = false; From b355be2d91cc63d723793791657561e23f7703d8 Mon Sep 17 00:00:00 2001 From: Gregor Kleen <20089782+gkleen@users.noreply.github.com> Date: Sun, 15 Jan 2023 14:06:58 +0100 Subject: [PATCH 47/49] chrony: add nixos test for ptp_kvm --- nixos/tests/all-tests.nix | 1 + nixos/tests/chrony-ptp.nix | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 nixos/tests/chrony-ptp.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b4bd8ef3e0f2..fe51123f1d0f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -126,6 +126,7 @@ in { cfssl = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cfssl.nix {}; charliecloud = handleTest ./charliecloud.nix {}; chromium = (handleTestOn ["aarch64-linux" "x86_64-linux"] ./chromium.nix {}).stable or {}; + chrony-ptp = handleTestOn ["aarch64-linux" "x86_64-linux"] ./chrony-ptp.nix {}; cinnamon = handleTest ./cinnamon.nix {}; cjdns = handleTest ./cjdns.nix {}; clickhouse = handleTest ./clickhouse.nix {}; diff --git a/nixos/tests/chrony-ptp.nix b/nixos/tests/chrony-ptp.nix new file mode 100644 index 000000000000..c5904645fc4e --- /dev/null +++ b/nixos/tests/chrony-ptp.nix @@ -0,0 +1,24 @@ +import ./make-test-python.nix ({ lib, ... }: +{ + name = "chrony-ptp"; + + nodes = { + qemuGuest = { lib, ... }: { + boot.kernelModules = [ "ptp_kvm" ]; + + services.chrony = { + enable = true; + extraConfig = '' + refclock PHC /dev/ptp_kvm poll 2 dpoll -2 offset 0 stratum 3 + ''; + }; + }; + }; + + testScript = '' + start_all() + + qemuGuest.wait_for_unit('multi-user.target') + qemuGuest.succeed('systemctl is-active chronyd.service') + ''; +}) From 239a93f205ee51368fe3e42f3cdeae705a69bfa8 Mon Sep 17 00:00:00 2001 From: Gregor Kleen <20089782+gkleen@users.noreply.github.com> Date: Sun, 15 Jan 2023 20:32:58 +0100 Subject: [PATCH 48/49] chrony: add gkleen as maintainer for nixos test for ptp_kvm --- maintainers/maintainer-list.nix | 6 ++++++ nixos/tests/chrony-ptp.nix | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e72d59da46e7..81b475669997 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5351,6 +5351,12 @@ githubId = 60962839; name = "Mazen Zahr"; }; + gkleen = { + name = "Gregor Kleen"; + email = "xpnfr@bouncy.email"; + github = "gkleen"; + githubId = 20089782; + }; gleber = { email = "gleber.p@gmail.com"; github = "gleber"; diff --git a/nixos/tests/chrony-ptp.nix b/nixos/tests/chrony-ptp.nix index c5904645fc4e..b2634a8cfc5c 100644 --- a/nixos/tests/chrony-ptp.nix +++ b/nixos/tests/chrony-ptp.nix @@ -2,6 +2,10 @@ import ./make-test-python.nix ({ lib, ... }: { name = "chrony-ptp"; + meta = { + maintainers = with lib.maintainers; [ gkleen ]; + }; + nodes = { qemuGuest = { lib, ... }: { boot.kernelModules = [ "ptp_kvm" ]; From 59dbe319cec232cf2604fa2ca8f018a05a0eb88a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jan 2023 23:46:22 +0300 Subject: [PATCH 49/49] nixos/gitea: update SystemCallFilter --- nixos/modules/services/networking/ntp/chrony.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index 69f0b36bf2a2..6c8d7b985d5f 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -203,7 +203,7 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "chown" ]; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "chown" ] ++ lib.optional pkgs.stdenv.hostPlatform.isAarch64 "fchownat"; }; }; };