From 1575eb8c3bc913a2a34f5377269869d6be1afe2c Mon Sep 17 00:00:00 2001 From: Hernan Lopez Vergara Date: Thu, 21 Apr 2022 16:45:28 +0200 Subject: [PATCH 001/161] yajl: fix url for fetching archive Accessing archive using current rev leads to an error saying that: the given path has multiple possibilities: #Git::Ref:0x00007f4cdbb09cd8, #Git::Ref:0x00007f4cdbb09008 Altering rev variable by adding the extra path resolves the problem --- pkgs/development/libraries/yajl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 645329f83cdb..022284b0b130 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lloyd"; repo = "yajl"; - rev = version; + rev = "refs/tags/${version}"; sha256 = "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml"; }; From 8419c3d260ab77169d3bb88508eba2fb467531f0 Mon Sep 17 00:00:00 2001 From: Pierre Thierry Date: Mon, 23 May 2022 18:20:14 +0200 Subject: [PATCH 002/161] maintainers: add kephasp --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a102231919e4..ad7dd8b8d3d5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6601,6 +6601,12 @@ githubId = 2029444; name = "James Kent"; }; + kephasp = { + email = "pierre@nothos.net"; + github = "kephas"; + githubId = 762421; + name = "Pierre Thierry"; + }; ketzacoatl = { email = "ketzacoatl@protonmail.com"; github = "ketzacoatl"; From fe4fbbd5cd86cbd60fbb4e83a3751384431c2f1a Mon Sep 17 00:00:00 2001 From: Pierre Thierry Date: Mon, 23 May 2022 18:22:22 +0200 Subject: [PATCH 003/161] karate: init at 1.2.0 --- pkgs/development/tools/karate/default.nix | 37 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/karate/default.nix diff --git a/pkgs/development/tools/karate/default.nix b/pkgs/development/tools/karate/default.nix new file mode 100644 index 000000000000..2dd409674019 --- /dev/null +++ b/pkgs/development/tools/karate/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenvNoCC, fetchurl, jre, makeWrapper }: + +stdenvNoCC.mkDerivation rec { + pname = "karate"; + version = "1.2.0"; + + src = fetchurl { + url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar"; + sha256 = "69b9ba1cd9563cbad802471e7250dd46828df7ad176706577389dfe6e604e5ec"; + }; + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + makeWrapper ${jre}/bin/java $out/bin/karate --add-flags "-jar $src" + runHook postInstall + ''; + + meta = with lib; { + description = "API Test Automation Made Simple"; + longDescription = '' + Karate is the only open-source tool to combine API + test-automation, mocks, performance-testing and even UI + automation into a single, unified framework. The BDD syntax + popularized by Cucumber is language-neutral, and easy for even + non-programmers. Assertions and HTML reports are built-in, and + you can run tests in parallel for speed. + ''; + homepage = "https://github.com/karatelabs/karate"; + changelog = "https://github.com/karatelabs/karate/releases/tag/v${version}"; + license = licenses.mit; + maintainers = [ maintainers.kephasp ]; + platforms = jre.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78d4ca310ee0..3dda9e9bf755 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15715,6 +15715,8 @@ with pkgs; kamid = callPackage ../servers/ftp/kamid { }; + karate = callPackage ../development/tools/karate { }; + kati = callPackage ../development/tools/build-managers/kati { }; kcat = callPackage ../development/tools/kcat { }; From d2990717f165acba5817d20f332159c797fad508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 29 May 2022 21:53:19 +0200 Subject: [PATCH 004/161] CONTRIBUTING.md: simplify rebasing instructions Makes the instructions easier to remember (and type) using the `git rebase --onto A...B` syntax to find the merge base between A and B (which has been in git for at least 10 years). We also assume that the merge base between staging and master is also the merge base between staging and the current branch (since it is based on master), and giving master as the branch makes git consider the commits in the current branch that are not in master, so there's no need to compute the merge base between master and the current branch. In the same spirit of discouraging copy-and-paste, use a placeholder name for the current branch instead of `$(git branch --show-current)`. --- CONTRIBUTING.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 46e3ea5b2240..0268d640a9a2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,25 +62,26 @@ many CODEOWNERS will be inadvertently requested for review. To achieve this, rebasing should not be performed directly on the target branch, but on the merge base between the current and target branch. -In the following example, we see a rebase from `master` onto the merge base -between `master` and `staging`, so that a change can eventually be retargeted to -`staging`. The example uses `upstream` as the remote for `NixOS/nixpkgs.git` -while the `origin` remote is used for the remote you are pushing to. +In the following example, we assume that the current branch, called `feature`, +is based on `master`, and we rebase it onto the merge base between +`master` and `staging` so that the PR can eventually be retargeted to +`staging` without causing a mess. The example uses `upstream` as the remote for `NixOS/nixpkgs.git` +while `origin` is the remote you are pushing to. ```console -# Find the common base between two branches -common=$(git merge-base upstream/master upstream/staging) -# Find the common base between your feature branch and master -commits=$(git merge-base $(git branch --show-current) upstream/master) -# Rebase all commits onto the common base -git rebase --onto=$common $commits +# Rebase your commits onto the common merge base +git rebase --onto upstream/staging... upstream/master # Force push your changes -git push origin $(git branch --show-current) --force-with-lease +git push origin feature --force-with-lease ``` +The syntax `upstream/staging...` is equivalent to `upstream/staging...HEAD` and +stands for the merge base between `upstream/staging` and `HEAD` (hence between +`upstream/staging` and `upstream/master`). + Then change the base branch in the GitHub PR using the *Edit* button in the upper -right corner, and switch from `master` to `staging`. After the PR has been +right corner, and switch from `master` to `staging`. *After* the PR has been retargeted it might be necessary to do a final rebase onto the target branch, to resolve any outstanding merge conflicts. @@ -90,7 +91,7 @@ git rebase upstream/staging # Review and fixup possible conflicts git status # Force push your changes -git push origin $(git branch --show-current) --force-with-lease +git push origin feature --force-with-lease ``` ## Backporting changes From 0c127705a0c5ead6c60973c6cb77ce10ce790a10 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Mon, 6 Jun 2022 10:00:29 +0200 Subject: [PATCH 005/161] binbloom: init at 2.0 --- pkgs/tools/security/binbloom/default.nix | 27 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/security/binbloom/default.nix diff --git a/pkgs/tools/security/binbloom/default.nix b/pkgs/tools/security/binbloom/default.nix new file mode 100644 index 000000000000..0805e7b988d4 --- /dev/null +++ b/pkgs/tools/security/binbloom/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "binbloom"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "quarkslab"; + repo = pname; + rev = "v${version}"; + hash = "sha256-UiKiDey/pHtJDr4UYqt+T/TneKig5tT8YU2u98Ttjmo="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Raw binary firmware analysis software"; + homepage = "https://github.com/quarkslab/binbloom"; + license = licenses.asl20; + maintainers = with maintainers; [ erdnaxe ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ce6d217dd35..2fed98b2c731 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -256,6 +256,8 @@ with pkgs; beyond-identity = callPackage ../tools/security/beyond-identity {}; + binbloom = callPackage ../tools/security/binbloom {}; + bingo = callPackage ../development/tools/bingo {}; bootstrap-studio = callPackage ../development/web/bootstrap-studio {}; From f880ea69baef7e6b7a639fab64ebc1fdde15962d Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Mon, 13 Jun 2022 15:29:41 -0700 Subject: [PATCH 006/161] nixos/globalprotect: add settings option for service configuration --- .../services/networking/globalprotect-vpn.nix | 27 ++++++++++++++++--- .../globalprotect-openconnect/default.nix | 4 --- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/globalprotect-vpn.nix b/nixos/modules/services/networking/globalprotect-vpn.nix index 976fdf2b962a..2ae8495f0181 100644 --- a/nixos/modules/services/networking/globalprotect-vpn.nix +++ b/nixos/modules/services/networking/globalprotect-vpn.nix @@ -5,7 +5,8 @@ with lib; let cfg = config.services.globalprotect; - execStart = if cfg.csdWrapper == null then + execStart = + if cfg.csdWrapper == null then "${pkgs.globalprotect-openconnect}/bin/gpservice" else "${pkgs.globalprotect-openconnect}/bin/gpservice --csd-wrapper=${cfg.csdWrapper}"; @@ -15,6 +16,22 @@ in options.services.globalprotect = { enable = mkEnableOption "globalprotect"; + settings = mkOption { + description = '' + GlobalProtect-openconnect configuration. For more information, visit + . + ''; + default = { }; + example = { + "vpn1.company.com" = { + openconnect-args = "--script=/path/to/vpnc-script"; + }; + }; + type = types.attrs; + }; + csdWrapper = mkOption { description = '' A script that will produce a Host Integrity Protection (HIP) report, @@ -29,12 +46,14 @@ in config = mkIf cfg.enable { services.dbus.packages = [ pkgs.globalprotect-openconnect ]; + environment.etc."gpservice/gp.conf".text = lib.generators.toINI { } cfg.settings; + systemd.services.gpservice = { description = "GlobalProtect openconnect DBus service"; serviceConfig = { - Type="dbus"; - BusName="com.yuezk.qt.GPService"; - ExecStart=execStart; + Type = "dbus"; + BusName = "com.yuezk.qt.GPService"; + ExecStart = execStart; }; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index acda428875e7..d62bfd737ec4 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -21,10 +21,6 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace GPService/gpservice.h \ --replace /usr/local/bin/openconnect ${openconnect}/bin/openconnect; - substituteInPlace GPClient/settingsdialog.ui \ - --replace /etc/gpservice/gp.conf $out/etc/gpservice/gp.conf; - substituteInPlace GPService/gpservice.cpp \ - --replace /etc/gpservice/gp.conf $out/etc/gpservice/gp.conf; substituteInPlace GPService/CMakeLists.txt \ --replace /etc/gpservice $out/etc/gpservice; ''; From 2c09ab4c6ed26814bef7eb893fbe51412196c707 Mon Sep 17 00:00:00 2001 From: Mario Hros Date: Sat, 25 Jun 2022 22:26:09 +0200 Subject: [PATCH 007/161] maintainers: add k3a --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4610d1f9a6c5..ed71324a6679 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6520,6 +6520,12 @@ githubId = 66669; name = "Jeff Zellner"; }; + k3a = { + email = "git+nix@catmail.app"; + name = "Mario Hros"; + github = "k3a"; + githubId = 966992; + }; k4leg = { name = "k4leg"; email = "python.bogdan@gmail.com"; From 50cec7d09370d2f8f0ff03dc94f504fa21103e9b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 26 Jun 2022 03:44:10 +0000 Subject: [PATCH 008/161] jsonnet-bundler: 0.4.0 -> 0.5.1 --- pkgs/development/tools/jsonnet-bundler/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/jsonnet-bundler/default.nix b/pkgs/development/tools/jsonnet-bundler/default.nix index 813c936cba3a..e627c9850503 100644 --- a/pkgs/development/tools/jsonnet-bundler/default.nix +++ b/pkgs/development/tools/jsonnet-bundler/default.nix @@ -2,19 +2,17 @@ buildGoModule rec { pname = "jsonnet-bundler"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "jsonnet-bundler"; repo = "jsonnet-bundler"; rev = "v${version}"; - sha256 = "0pk6nf8r0wy7lnsnzyjd3vgq4b2kb3zl0xxn01ahpaqgmwpzajlk"; + sha256 = "sha256-vjb5wEiJw48s7FUarpA94ZauFC7iEgRDAkRTwRIZ8pA="; }; vendorSha256 = null; - subPackages = [ "cmd/jb" ]; - ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { From 0570ae054a7b60f4572987f8db0718fa36d08050 Mon Sep 17 00:00:00 2001 From: Mario Hros Date: Wed, 22 Jun 2022 23:35:16 +0200 Subject: [PATCH 009/161] openboardview: init at 9.0.3 --- .../electronics/openboardview/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/applications/science/electronics/openboardview/default.nix diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix new file mode 100644 index 000000000000..b2ae28baa92b --- /dev/null +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub +, gitUpdater +, cmake +, pkg-config +, python3 +, SDL2 +, fontconfig +, gtk3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "openboardview"; + version = "9.0.3"; + + src = fetchFromGitHub { + owner = "OpenBoardView"; + repo = "OpenBoardView"; + rev = version; + sha256 = "sha256-0vxWFNM9KQ5zs+VDDV3mVMfHZau4pgNxQ1HhH2vktCM="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook ]; + buildInputs = [ SDL2 fontconfig gtk3 ]; + + postPatch = '' + substituteInPlace src/openboardview/CMakeLists.txt \ + --replace "SDL2::SDL2main" "" + ''; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DGLAD_REPRODUCIBLE=On" + ]; + + dontWrapGApps = true; + postFixup = '' + wrapGApp "$out/bin/${pname}" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]} + ''; + + passthru.updateScript = gitUpdater { + inherit pname version; + ignoredVersions = ''.*\.90\..*''; + }; + + meta = with lib; { + description = "Linux SDL/ImGui edition software for viewing .brd files"; + homepage = "https://github.com/OpenBoardView/OpenBoardView"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ k3a ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75a5459f788a..94b16c7437dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33774,6 +33774,8 @@ with pkgs; openroad = libsForQt5.callPackage ../applications/science/electronics/openroad { }; + openboardview = callPackage ../applications/science/electronics/openboardview { }; + pcb = callPackage ../applications/science/electronics/pcb { }; qucs = callPackage ../applications/science/electronics/qucs { }; From 71d3f34e68d265305e801ffad46209f742368204 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Tue, 28 Jun 2022 08:59:09 +0200 Subject: [PATCH 010/161] yubikey-personalization-gui: fix pixmap installation The desktop file was copied over twice, once as desktop file, once as pixmap. Fix this and copy the actual pixmap. --- pkgs/tools/misc/yubikey-personalization-gui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 3d489a13c6ea..66f43ad9bfca 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -19,9 +19,9 @@ mkDerivation rec { # Desktop files install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/applications/yubikey-personalization-gui.desktop" - install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/pixmaps/yubikey-personalization-gui.xpm" # Icons + install -D -m0644 resources/lin/yubikey-personalization-gui.xpm "$out/share/pixmaps/yubikey-personalization-gui.xpm" install -D -m0644 resources/lin/yubikey-personalization-gui.png "$out/share/icons/hicolor/128x128/apps/yubikey-personalization-gui.png" for SIZE in 16 24 32 48 64 96; do # set modify/create for reproducible builds From d7956c52e1f56a7c180d2c290fa7b92d0e99f15a Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Tue, 28 Jun 2022 06:26:19 +0300 Subject: [PATCH 011/161] autorandr: WIP Fix distutils import warning Because autorandr still imports distutils, it produces a bunch of deprecation warnings. we need to add packaging to propagatedBuildInputs, but because this wasn't wrapped, the wrapper hook did not take care of adjusting the system path. The easiest way I could find to fix this was to actually wrap autorandr. Then I also had to add a patch to disable autorandr using sys.executable to fork itself in --batch mode. Otherwise it tries to use python to run the bash wrapper, which doesn't work. This should be fine in a nixpkgs environment, since nixpkgs sets the shebang explicitly. --- .../0001-don-t-use-sys.executable.patch | 33 +++++++++++++++++++ pkgs/tools/misc/autorandr/default.nix | 11 ++++--- 2 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch diff --git a/pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch b/pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch new file mode 100644 index 000000000000..81879a8f834b --- /dev/null +++ b/pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch @@ -0,0 +1,33 @@ +From fdcc2f01441ec25104456022e6f8d3120709cede Mon Sep 17 00:00:00 2001 +From: Romanos Skiadas +Date: Tue, 28 Jun 2022 06:16:10 +0300 +Subject: [PATCH] don't use sys.executable + +This is required for forking self in a nixpkgs environment, +where arandr might be wrapped. In that case, the actual arandr command +will be a bash script, not python. +There is no real reason to keep this around, nixpkgs properly sets the +interpreter in the shebang anyway. +--- + autorandr.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git autorandr.py autorandr.py +index 35c15f6..1e84a2f 100755 +--- a/autorandr.py ++++ b/autorandr.py +@@ -1192,10 +1192,7 @@ def dispatch_call_to_sessions(argv): + os.chdir(pwent.pw_dir) + os.environ.clear() + os.environ.update(process_environ) +- if sys.executable != "" and sys.executable != None: +- os.execl(sys.executable, sys.executable, autorandr_binary, *argv[1:]) +- else: +- os.execl(autorandr_binary, autorandr_binary, *argv[1:]) ++ os.execl(autorandr_binary, autorandr_binary, *argv[1:]) + sys.exit(1) + os.waitpid(child_pid, 0) + +-- +2.36.1 + diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index bf54d6a445ef..7a9a30756ffc 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -1,25 +1,26 @@ -{ lib, stdenv +{ lib +, python3 , python3Packages , fetchFromGitHub , systemd , xrandr , installShellFiles }: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { pname = "autorandr"; version = "1.12.1"; - buildInputs = [ python3Packages.python ]; - nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = [ python3Packages.packaging ]; - # no wrapper, as autorandr --batch does os.environ.clear() buildPhase = '' substituteInPlace autorandr.py \ --replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \ --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' ''; + patches = [ ./0001-don-t-use-sys.executable.patch ]; + outputs = [ "out" "man" ]; installPhase = '' From bb7867f1e5080de1dfff80e2f7d5a4be49889e23 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sat, 2 Jul 2022 16:12:16 +0200 Subject: [PATCH 012/161] vscode: simplify helper scripts This simplifies the following commit. - Remove `--` from `rm` because `$tmpDir` is guaranteed to never start with a `-`. We also don't use this pattern when removing tmpDirs at other places in nixpkgs. - Remove `unset tmpDir` because the variable `tmpDir` is never accessed after the exit handler is run. --- .../vscode/extensions/_maintainers/update-bin-srcs-lib.sh | 5 ++--- .../editors/vscode/extensions/cpptools/update_helper.sh | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh b/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh index e3d1e5fb1397..6a8968024c88 100755 --- a/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh +++ b/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh @@ -37,9 +37,8 @@ prefetchExtensionUnpacked() { 1>&2 echo "zipStorePath='$zipStorePath'" function rm_tmpdir() { - 1>&2 printf "rm -rf -- %q\n" "$tmpDir" - rm -rf -- "$tmpDir" - unset tmpDir + 1>&2 printf "rm -rf %q\n" "$tmpDir" + rm -rf "$tmpDir" trap - INT TERM HUP EXIT } function make_trapped_tmpdir() { diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh b/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh index 00ef77553242..3c1d68de79cd 100755 --- a/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh +++ b/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh @@ -44,9 +44,7 @@ extStoreName="${extPublisher}-${extName}" function rm_tmpdir() { - #echo "Removing \`tmpDir='$tmpDir'\`" - rm -rf -- "$tmpDir" - unset tmpDir + rm -rf "$tmpDir" trap - INT TERM HUP EXIT } function make_trapped_tmpdir() { From 3f54dfa4755613dbd3098814a9ab07cb977ca347 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sat, 2 Jul 2022 12:51:12 +0200 Subject: [PATCH 013/161] treewide: fix bash exit handlers Transform exit handlers of the form trap cleanup EXIT [INT] [TERM] [QUIT] [HUP] [ERR] (where cleanup is idempotent) to trap cleanup EXIT This fixes a common bash antipattern. Each of the above signals causes the script to exit. For each signal, bash first handles the signal by running `cleanup` and then runs `cleanup` again when handling EXIT. (Exception: `vscode/*` prevents the second run of `cleanup` by removing the trap in cleanup`). Simplify the cleanup logic by just trapping exit, which is always run when the script exits due to any of the above signals. Note: In case of borgbackup, the exit handler is not idempotent, but just trapping EXIT guarantees that it's only run once. --- maintainers/scripts/rebuild-amount.sh | 2 +- nixos/modules/services/backup/borgbackup.nix | 4 +--- nixos/modules/services/web-apps/keycloak.nix | 2 +- .../vscode/extensions/_maintainers/update-bin-srcs-lib.sh | 3 +-- .../editors/vscode/extensions/cpptools/update_helper.sh | 3 +-- pkgs/build-support/fetchcvs/nix-prefetch-cvs | 6 ++---- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/maintainers/scripts/rebuild-amount.sh b/maintainers/scripts/rebuild-amount.sh index bedd352db5f3..32810f6b98c0 100755 --- a/maintainers/scripts/rebuild-amount.sh +++ b/maintainers/scripts/rebuild-amount.sh @@ -35,7 +35,7 @@ toRemove=() cleanup() { rm -rf "${toRemove[@]}" } -trap cleanup EXIT SIGINT SIGQUIT ERR +trap cleanup EXIT MKTEMP='mktemp --tmpdir nix-rebuild-amount-XXXXXXXX' diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 4c9ddfe4674b..7cf2c080f813 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -23,12 +23,10 @@ let on_exit() { exitStatus=$? - # Reset the EXIT handler, or else we're called again on 'exit' below - trap - EXIT ${cfg.postHook} exit $exitStatus } - trap 'on_exit' INT TERM QUIT EXIT + trap on_exit EXIT archiveName="${if cfg.archiveBaseName == null then "" else cfg.archiveBaseName + "-"}$(date ${cfg.dateFormat})" archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}" diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index a1855e1c1a79..a4baad8e9213 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -569,7 +569,7 @@ in shopt -s inherit_errexit create_role="$(mktemp)" - trap 'rm -f "$create_role"' ERR EXIT + trap 'rm -f "$create_role"' EXIT db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")" echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" > "$create_role" diff --git a/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh b/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh index 6a8968024c88..4b0ca54da362 100755 --- a/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh +++ b/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh @@ -39,11 +39,10 @@ prefetchExtensionUnpacked() { function rm_tmpdir() { 1>&2 printf "rm -rf %q\n" "$tmpDir" rm -rf "$tmpDir" - trap - INT TERM HUP EXIT } function make_trapped_tmpdir() { tmpDir=$(mktemp -d) - trap rm_tmpdir INT TERM HUP EXIT + trap rm_tmpdir EXIT } 1>&2 echo diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh b/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh index 3c1d68de79cd..d7bd307c92a0 100755 --- a/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh +++ b/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh @@ -45,11 +45,10 @@ extStoreName="${extPublisher}-${extName}" function rm_tmpdir() { rm -rf "$tmpDir" - trap - INT TERM HUP EXIT } function make_trapped_tmpdir() { tmpDir=$(mktemp -d) - trap rm_tmpdir INT TERM HUP EXIT + trap rm_tmpdir EXIT } echo diff --git a/pkgs/build-support/fetchcvs/nix-prefetch-cvs b/pkgs/build-support/fetchcvs/nix-prefetch-cvs index f9ed8ffa066f..b6a169f8b531 100755 --- a/pkgs/build-support/fetchcvs/nix-prefetch-cvs +++ b/pkgs/build-support/fetchcvs/nix-prefetch-cvs @@ -21,13 +21,11 @@ fi mkTempDir() { tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-cvs-XXXXXXXX")" - trap removeTempDir EXIT SIGINT SIGQUIT + trap removeTempDir EXIT } removeTempDir() { - if test -n "$tmpPath"; then - rm -rf "$tmpPath" || true - fi + rm -rf "$tmpPath" } From 80ba8111d4378be1fc78b413d56fecb0fcfa3399 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 4 Jul 2022 08:29:23 +0000 Subject: [PATCH 014/161] buildBazelPackage: allow custom impureEnvVars --- pkgs/build-support/build-bazel-package/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 74486e2e1003..f379334786b6 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation (fBuildAttrs // { name = "${name}-deps.tar.gz"; inherit bazelFlags bazelBuildFlags bazelFetchFlags bazelTarget; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ fFetchAttrs.impureEnvVars or []; nativeBuildInputs = fFetchAttrs.nativeBuildInputs or [] ++ [ bazel ]; From 6f874543c8f62aa05b7501ece0db00a7fd76b5ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 11:42:26 +0000 Subject: [PATCH 015/161] embree: 3.13.3 -> 3.13.4 --- pkgs/development/libraries/embree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 6417f4b05a1c..fb8db3a218e6 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.13.3"; + version = "3.13.4"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-g6BsXMNUvx17hgAq0PewtBLgtWqpp03M0k6vWNapDKs="; + sha256 = "sha256-WmblxU1kHiC8+hYAfUDcbJ1/e80f1LcKX8qCwgaBwGc="; }; postPatch = '' From 45be84d314d6094c1a83f5c30852604a00f9ad67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 13:08:38 +0000 Subject: [PATCH 016/161] fldigi: 4.1.20 -> 4.1.23 --- pkgs/applications/radio/fldigi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 4b33d331f5b6..549df5d9b5dd 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "fldigi"; - version = "4.1.20"; + version = "4.1.23"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0f64pqijl3jlfmv00hkdxvn1wy5yy3zl33p6vf3fn1b91w590c2h"; + sha256 = "sha256-42bh/J/DQ/V9ORKKZgOmlvhyNR7UjbqPPD0Wi9ofyo0="; }; nativeBuildInputs = [ pkg-config ]; From 041e449f8820a1479b8e8f41990595455e4533b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 13:27:50 +0000 Subject: [PATCH 017/161] flmsg: 4.0.19 -> 4.0.20 --- pkgs/applications/radio/flmsg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index cb0925019f9c..588185d9fbb7 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.19"; + version = "4.0.20"; pname = "flmsg"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "sha256-Pm5qAUNbenkX9V3OSQWW09iIRR/WB1jB4ioyRCZmjqs="; + sha256 = "sha256-TsYwd2uUGJsweiKigTWBPXA7PtItZeIOxKk3lV3sy24="; }; buildInputs = [ From ab2bb95249236f6afe712926b395c1ac65a93447 Mon Sep 17 00:00:00 2001 From: Semion Nadezhdin Date: Thu, 7 Jul 2022 17:01:16 +0300 Subject: [PATCH 018/161] acpica-tools: repair installPhase for darwin Upstream degrades install to cp which is incompatible with -m 555 option. This change ensures INSTALLFLAGS is not applied on darwin. --- pkgs/tools/system/acpica-tools/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index b34302bde580..bf42608411a8 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # We can handle stripping ourselves. - INSTALLFLAGS = "-m 555"; + # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected. + INSTALLFLAGS = lib.optionals (!stdenv.isDarwin) "-m 555"; installFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -41,6 +42,6 @@ stdenv.mkDerivation rec { description = "ACPICA Tools"; license = with licenses; [ iasl gpl2Only bsd3 ]; maintainers = with maintainers; [ tadfisher ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From 06ba031afa2730fc085ca7aba49fabd12576fe59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 19:12:16 +0000 Subject: [PATCH 019/161] avizo: 1.2 -> 1.2.1 --- pkgs/applications/misc/avizo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/applications/misc/avizo/default.nix index d4808829586b..eefb3514d2e0 100644 --- a/pkgs/applications/misc/avizo/default.nix +++ b/pkgs/applications/misc/avizo/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "avizo"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "misterdanb"; repo = "avizo"; rev = version; - sha256 = "sha256-BRtdCOBFsKkJif/AlnF7N9ZDcmA+878M9lDQld+SAgo="; + sha256 = "sha256-ainU4nXWFp1udVujPHZUeWIfJE4RrjU1hn9J17UuuzU="; }; nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; From 4f92d7c0e22258358664f5289fcc94f8bde522e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 21:05:32 +0000 Subject: [PATCH 020/161] calamares: 3.2.59 -> 3.2.60 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 7565aa018253..de37fef3a506 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.59"; + version = "3.2.60"; # release including submodule src = fetchurl { url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "55adef250613e80a868f2aa3d1e57bdae5b769387d91decf0fe2b64e3605574f"; + sha256 = "sha256-nsbEn04jFs0wWNQCwqtl7/8C4/CaACjVDwNZ5RVObIw="; }; patches = lib.optionals nixos-extensions [ From 3772903ede363ece60ad52aff739ba56663e35be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 21:43:48 +0000 Subject: [PATCH 021/161] duo-unix: 1.12.0 -> 1.12.1 --- pkgs/tools/security/duo-unix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 5769e1a4b7b4..2b42fb171f34 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "duo-unix"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "sha256-i7oAmNjXkGn1MCn5EBmidMY/u3h/rzRAHCD4uhVGV/Q="; + sha256 = "sha256-oufVgjJHV4ew50gd529b3MvVtBoebcDUGZUn0rHP4ZE="; }; buildInputs = [ pam openssl zlib ]; From 2cdbc00b2c3c74d0ad1b78d7e809d6c94cddad82 Mon Sep 17 00:00:00 2001 From: nanashi0x74 Date: Sun, 15 May 2022 19:29:05 +0200 Subject: [PATCH 022/161] flutter: use `dart pub` instead of deprecated pub command --- pkgs/development/compilers/flutter/flutter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 43538ede339e..28a78c3e3060 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -61,7 +61,7 @@ let # path is relative otherwise it's replaced by /build/flutter pushd "$FLUTTER_TOOLS_DIR" - ${dart}/bin/pub get --offline + ${dart}/bin/dart pub get --offline popd local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" From 04699b7b7e30b53d8eeb4817f9aa69bf6baeff51 Mon Sep 17 00:00:00 2001 From: nanashi0x74 Date: Sun, 15 May 2022 19:36:01 +0200 Subject: [PATCH 023/161] flutter: 2.10.1->3.0.4 --- pkgs/development/compilers/flutter/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index acff9dd030eb..4529d2adc1aa 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -4,24 +4,25 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "2.10.1"; + version = "3.0.4"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; # Decouples flutter derivation from dart derivation, # use specific dart version to not need to bump dart derivation when bumping flutter. - dartVersion = "2.16.2"; + dartVersion = "2.17.5"; dartSourceBase = "https://storage.googleapis.com/dart-archive/channels"; dartForFlutter = dart.override { version = dartVersion; sources = { "${dartVersion}-x86_64-linux" = fetchurl { url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI="; + sha256 = "sha256-AFJGeiPsjUZSO+DykmOIFETg2jIohg62tp3ghZrKJFk="; }; }; }; -in { +in +{ inherit mkFlutter; stable = mkFlutter rec { inherit version; @@ -29,7 +30,7 @@ in { pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}"; - sha256 = "sha256-rSfwcglDV2rvJl10j7FByAWmghd2FYxrlkgYnvRO54Y="; + sha256 = "sha256-vh3QjLGFBN321DUET9XhYqSkILjEj+ZqAALu/mxY+go="; }; patches = getPatches ./patches; }; From 02e10382d53894fdac31b6ac02c6eca3194cbdc0 Mon Sep 17 00:00:00 2001 From: nanashi0x74 Date: Fri, 10 Jun 2022 01:22:10 +0200 Subject: [PATCH 024/161] flutter: patch git version check --- .../compilers/flutter/patches/git-dir.patch | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 pkgs/development/compilers/flutter/patches/git-dir.patch diff --git a/pkgs/development/compilers/flutter/patches/git-dir.patch b/pkgs/development/compilers/flutter/patches/git-dir.patch new file mode 100644 index 000000000000..0c736f945ea9 --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/git-dir.patch @@ -0,0 +1,102 @@ +diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart +index 468a91a954..5def6897ce 100644 +--- a/dev/bots/prepare_package.dart ++++ b/dev/bots/prepare_package.dart +@@ -525,7 +525,7 @@ class ArchiveCreator { + + Future _runGit(List args, {Directory? workingDirectory}) { + return _processRunner.runProcess( +- ['git', ...args], ++ ['git', '--git-dir', '.git', ...args], + workingDirectory: workingDirectory ?? flutterRoot, + ); + } +diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart +index bb0eb428a9..4a2a48bb5e 100644 +--- a/packages/flutter_tools/lib/src/commands/downgrade.dart ++++ b/packages/flutter_tools/lib/src/commands/downgrade.dart +@@ -118,7 +118,7 @@ class DowngradeCommand extends FlutterCommand { + // Detect unknown versions. + final ProcessUtils processUtils = _processUtils!; + final RunResult parseResult = await processUtils.run([ +- 'git', 'describe', '--tags', lastFlutterVersion, ++ 'git', '--git-dir', '.git', 'describe', '--tags', lastFlutterVersion, + ], workingDirectory: workingDirectory); + if (parseResult.exitCode != 0) { + throwToolExit('Failed to parse version for downgrade:\n${parseResult.stderr}'); +@@ -191,7 +191,7 @@ class DowngradeCommand extends FlutterCommand { + continue; + } + final RunResult parseResult = await _processUtils!.run([ +- 'git', 'describe', '--tags', sha, ++ 'git', '--git-dir', '.git', 'describe', '--tags', sha, + ], workingDirectory: workingDirectory); + if (parseResult.exitCode == 0) { + buffer.writeln('Channel "${getNameForChannel(channel)}" was previously on: ${parseResult.stdout}.'); +diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart +index f2068a6ca2..99b161689e 100644 +--- a/packages/flutter_tools/lib/src/version.dart ++++ b/packages/flutter_tools/lib/src/version.dart +@@ -106,7 +106,7 @@ class FlutterVersion { + String? channel = _channel; + if (channel == null) { + final String gitChannel = _runGit( +- 'git rev-parse --abbrev-ref --symbolic @{u}', ++ 'git --git-dir .git rev-parse --abbrev-ref --symbolic @{u}', + globals.processUtils, + _workingDirectory, + ); +@@ -114,7 +114,7 @@ class FlutterVersion { + if (slash != -1) { + final String remote = gitChannel.substring(0, slash); + _repositoryUrl = _runGit( +- 'git ls-remote --get-url $remote', ++ 'git --git-dir .git ls-remote --get-url $remote', + globals.processUtils, + _workingDirectory, + ); +@@ -326,7 +326,7 @@ class FlutterVersion { + /// the branch name will be returned as `'[user-branch]'`. + String getBranchName({ bool redactUnknownBranches = false }) { + _branch ??= () { +- final String branch = _runGit('git rev-parse --abbrev-ref HEAD', globals.processUtils); ++ final String branch = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', globals.processUtils); + return branch == 'HEAD' ? channel : branch; + }(); + if (redactUnknownBranches || _branch!.isEmpty) { +@@ -359,7 +359,7 @@ class FlutterVersion { + /// wrapper that does that. + @visibleForTesting + static List gitLog(List args) { +- return ['git', '-c', 'log.showSignature=false', 'log'] + args; ++ return ['git', '-c', 'log.showSignature=false', '--git-dir', '.git', 'log'] + args; + } + + /// Gets the release date of the latest available Flutter version. +@@ -730,7 +730,7 @@ class GitTagVersion { + + static GitTagVersion determine(ProcessUtils processUtils, {String? workingDirectory, bool fetchTags = false, String gitRef = 'HEAD'}) { + if (fetchTags) { +- final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory); ++ final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory); + if (channel == 'dev' || channel == 'beta' || channel == 'stable') { + globals.printTrace('Skipping request to fetchTags - on well known channel $channel.'); + } else { +@@ -739,7 +739,7 @@ class GitTagVersion { + } + // find all tags attached to the given [gitRef] + final List tags = _runGit( +- 'git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n'); ++ 'git --git-dir .git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n'); + + // Check first for a stable tag + final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$'); +@@ -760,7 +760,7 @@ class GitTagVersion { + // recent tag and number of commits past. + return parse( + _runGit( +- 'git describe --match *.*.* --long --tags $gitRef', ++ 'git --git-dir .git describe --match *.*.* --long --tags $gitRef', + processUtils, + workingDirectory, + ) From 43d2b91944bd628cf91aadddd18cb48768f8f37e Mon Sep 17 00:00:00 2001 From: nanashi0x74 Date: Fri, 24 Jun 2022 15:16:20 +0200 Subject: [PATCH 025/161] flutter: amend move-cache patch after update --- .../flutter/patches/move-cache.patch | 130 ++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/pkgs/development/compilers/flutter/patches/move-cache.patch b/pkgs/development/compilers/flutter/patches/move-cache.patch index a81d2def242c..5cb7c71e9bd4 100644 --- a/pkgs/development/compilers/flutter/patches/move-cache.patch +++ b/pkgs/development/compilers/flutter/patches/move-cache.patch @@ -70,3 +70,133 @@ index defc86cc20..7fdf14d112 100644 } } +diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart +index 2aac9686e8..32c4b98b88 100644 +--- a/packages/flutter_tools/lib/src/artifacts.dart ++++ b/packages/flutter_tools/lib/src/artifacts.dart +@@ -346,10 +346,10 @@ class CachedArtifacts implements Artifacts { + ) { + switch (artifact) { + case HostArtifact.engineDartSdkPath: +- final String path = _dartSdkPath(_cache); ++ final String path = _dartSdkPath(_fileSystem); + return _fileSystem.directory(path); + case HostArtifact.engineDartBinary: +- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows)); ++ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows)); + return _fileSystem.file(path); + case HostArtifact.flutterWebSdk: + final String path = _getFlutterWebSdkPath(); +@@ -398,7 +398,7 @@ class CachedArtifacts implements Artifacts { + case HostArtifact.dart2jsSnapshot: + case HostArtifact.dartdevcSnapshot: + case HostArtifact.kernelWorkerSnapshot: +- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows)); ++ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows)); + return _fileSystem.file(path); + case HostArtifact.iosDeploy: + final String artifactFileName = _hostArtifactToFileName(artifact, _platform.isWindows); +@@ -461,11 +461,13 @@ class CachedArtifacts implements Artifacts { + String _getAndroidArtifactPath(Artifact artifact, TargetPlatform platform, BuildMode mode) { + final String engineDir = _getEngineArtifactsPath(platform, mode)!; + switch (artifact) { ++ case Artifact.frontendServerSnapshotForEngineDartSdk: ++ assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.'); ++ return _fileSystem.path.join(engineDir, _artifactToFileName(artifact)); + case Artifact.genSnapshot: + assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.'); + final String hostPlatform = getNameForHostPlatform(getCurrentHostPlatform()); + return _fileSystem.path.join(engineDir, hostPlatform, _artifactToFileName(artifact)); +- case Artifact.frontendServerSnapshotForEngineDartSdk: + case Artifact.constFinder: + case Artifact.flutterFramework: + case Artifact.flutterMacOSFramework: +@@ -497,13 +499,13 @@ class CachedArtifacts implements Artifacts { + switch (artifact) { + case Artifact.genSnapshot: + case Artifact.flutterXcframework: ++ case Artifact.frontendServerSnapshotForEngineDartSdk: + final String artifactFileName = _artifactToFileName(artifact)!; + final String engineDir = _getEngineArtifactsPath(platform, mode)!; + return _fileSystem.path.join(engineDir, artifactFileName); + case Artifact.flutterFramework: + final String engineDir = _getEngineArtifactsPath(platform, mode)!; + return _getIosEngineArtifactPath(engineDir, environmentType, _fileSystem); +- case Artifact.frontendServerSnapshotForEngineDartSdk: + case Artifact.constFinder: + case Artifact.flutterMacOSFramework: + case Artifact.flutterMacOSPodspec: +@@ -594,14 +596,10 @@ class CachedArtifacts implements Artifacts { + // For script snapshots any gen_snapshot binary will do. Returning gen_snapshot for + // android_arm in profile mode because it is available on all supported host platforms. + return _getAndroidArtifactPath(artifact, TargetPlatform.android_arm, BuildMode.profile); +- case Artifact.frontendServerSnapshotForEngineDartSdk: +- return _fileSystem.path.join( +- _dartSdkPath(_cache), 'bin', 'snapshots', +- _artifactToFileName(artifact), +- ); + case Artifact.flutterTester: + case Artifact.vmSnapshotData: + case Artifact.isolateSnapshotData: ++ case Artifact.frontendServerSnapshotForEngineDartSdk: + case Artifact.icuData: + final String engineArtifactsPath = _cache.getArtifactDirectory('engine').path; + final String platformDirName = _enginePlatformDirectoryName(platform); +@@ -797,7 +795,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts { + final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows)); + return _fileSystem.file(path); + case HostArtifact.dartdevcSnapshot: +- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows)); ++ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows)); + return _fileSystem.file(path); + case HostArtifact.kernelWorkerSnapshot: + final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows)); +@@ -922,9 +920,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts { + case Artifact.windowsUwpCppClientWrapper: + return _fileSystem.path.join(_hostEngineOutPath, artifactFileName); + case Artifact.frontendServerSnapshotForEngineDartSdk: +- return _fileSystem.path.join( +- _hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', artifactFileName, +- ); ++ return _fileSystem.path.join(_hostEngineOutPath, 'gen', artifactFileName); + case Artifact.uwptool: + return _fileSystem.path.join(_hostEngineOutPath, artifactFileName); + } +@@ -1034,8 +1030,8 @@ class OverrideArtifacts implements Artifacts { + } + + /// Locate the Dart SDK. +-String _dartSdkPath(Cache cache) { +- return cache.getRoot().childDirectory('dart-sdk').path; ++String _dartSdkPath(FileSystem fileSystem) { ++ return fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'dart-sdk'); + } + + class _TestArtifacts implements Artifacts { +diff --git a/packages/flutter_tools/test/general.shard/artifacts_test.dart b/packages/flutter_tools/test/general.shard/artifacts_test.dart +index d906511a15..adfdd4bb42 100644 +--- a/packages/flutter_tools/test/general.shard/artifacts_test.dart ++++ b/packages/flutter_tools/test/general.shard/artifacts_test.dart +@@ -153,10 +153,6 @@ void main() { + artifacts.getArtifactPath(Artifact.windowsUwpDesktopPath, platform: TargetPlatform.windows_uwp_x64, mode: BuildMode.release), + fileSystem.path.join('root', 'bin', 'cache', 'artifacts', 'engine', 'windows-uwp-x64-release'), + ); +- expect( +- artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), +- fileSystem.path.join('root', 'bin', 'cache', 'dart-sdk', 'bin', 'snapshots', 'frontend_server.dart.snapshot') +- ); + }); + + testWithoutContext('precompiled web artifact paths are correct', () { +@@ -322,11 +318,6 @@ void main() { + artifacts.getHostArtifact(HostArtifact.engineDartSdkPath).path, + fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk'), + ); +- expect( +- artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), +- fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk', 'bin', +- 'snapshots', 'frontend_server.dart.snapshot') +- ); + }); + + testWithoutContext('getEngineType', () { From 043de04db8a6b0391b3fefaaade160514d866946 Mon Sep 17 00:00:00 2001 From: nanashi0x74 Date: Wed, 6 Jul 2022 00:14:43 +0200 Subject: [PATCH 026/161] update hashes for fluffychat and firmware-updater --- .../networking/instant-messengers/fluffychat/default.nix | 2 +- pkgs/os-specific/linux/firmware/firmware-updater/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 565c44f72e92..d50e7118cc18 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -10,7 +10,7 @@ flutter.mkFlutterApp rec { pname = "fluffychat"; version = "1.2.0"; - vendorHash = "sha256-j5opwEFifa+DMG7Uziv4SWEPVokD6OSq8mSIr0AdDL0="; + vendorHash = "sha256-co+bnsVIyg42JpM9FimfGEjrd6A99GlBeow1Dgv7NBI="; src = fetchFromGitLab { owner = "famedly"; diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index 02b549dd9ea1..fb9d3a9a36c4 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -7,7 +7,7 @@ flutter.mkFlutterApp { pname = "firmware-updater"; version = "unstable"; - vendorHash = "sha256-L8am4vTx4KlMHUdIhrUsCxGc27vkolawS/9DyFCPOJQ="; + vendorHash = "sha256-3wVA9BLCnMijC0gOmskz+Hv7NQIGu/jhBDbWjmoq1Tc="; src = fetchFromGitHub { owner = "canonical"; From 4ff2e5d7e0c6337d46a1e089f9b653a19b9f7aa4 Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Sun, 3 Jul 2022 22:29:30 +1000 Subject: [PATCH 027/161] restool: also depend on which The ls-main script uses `which`. It also has /bin/sh as its shebang, which means bash runs in Bourne-compatible mode and `which` is not a builtin. When the ls-* scripts are invoked from a user shell you don't notice the problem, because /run/current-system/sw/bin/which is on $PATH, but when they are invoked in a systemd service it would fail: .../bin/ls-addni: line 1054: which: command not found --- pkgs/os-specific/linux/restool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/restool/default.nix b/pkgs/os-specific/linux/restool/default.nix index 83c7c93ffcd8..9b8ade24748c 100644 --- a/pkgs/os-specific/linux/restool/default.nix +++ b/pkgs/os-specific/linux/restool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, bash, coreutils, dtc, file, gawk, gnugrep, gnused }: +{ stdenv, lib, fetchgit, bash, coreutils, dtc, file, gawk, gnugrep, gnused, which }: stdenv.mkDerivation rec { pname = "restool"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ file ]; - buildInputs = [ bash coreutils dtc gawk gnugrep gnused ]; + buildInputs = [ bash coreutils dtc gawk gnugrep gnused which ]; makeFlags = [ "prefix=$(out)" From 744f00c6b108794bef7b3887d45c52778f1eddcf Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Sat, 23 Jul 2022 10:01:27 +1000 Subject: [PATCH 028/161] =?UTF-8?q?restool:=2020.12=20=E2=86=92=202.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream appears to have changed their versioning scheme. Instead of being tied to LSDK date-based versions, restool is versioned independently. There are no tags or releases following the new versioning scheme, so update the package to take the most recent commit (27 Oct 2021). This also matches the revision that Fedora has packaged as version 2.4. --- pkgs/os-specific/linux/restool/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/restool/default.nix b/pkgs/os-specific/linux/restool/default.nix index 9b8ade24748c..add68522e7f9 100644 --- a/pkgs/os-specific/linux/restool/default.nix +++ b/pkgs/os-specific/linux/restool/default.nix @@ -1,20 +1,23 @@ -{ stdenv, lib, fetchgit, bash, coreutils, dtc, file, gawk, gnugrep, gnused, which }: +{ stdenv, lib, fetchgit, bash, coreutils, dtc, file, gawk, gnugrep, gnused, pandoc, which }: stdenv.mkDerivation rec { pname = "restool"; - version = "20.12"; + version = "2.4"; src = fetchgit { url = "https://source.codeaurora.org/external/qoriq/qoriq-components/restool"; - rev = "LSDK-${version}"; - sha256 = "137xvvms3n4wwb5v2sv70vsib52s3s314306qa0mqpgxf9fb19zl"; + rev = "abd2f5b7181db9d03db9e6ccda0194923b73e9a2"; + sha256 = "sha256-ryTDyqSy39e8Omf7l8lK4mLWr8jccDhMVPldkVGSQVo="; }; - nativeBuildInputs = [ file ]; + nativeBuildInputs = [ file pandoc ]; buildInputs = [ bash coreutils dtc gawk gnugrep gnused which ]; + enableParallelBuilding = true; makeFlags = [ - "prefix=$(out)" + "prefix=" + "bindir_completion=/share/bash-completion/completions" + "DESTDIR=$(out)" "VERSION=${version}" ]; From c178795063fd86755fad525dc8e98afa9ca2e155 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Jul 2022 18:47:38 +0000 Subject: [PATCH 029/161] atlantis: 0.19.6 -> 0.19.7 --- pkgs/applications/networking/cluster/atlantis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 9b615f151c25..8942e2ec65b7 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.19.6"; + version = "0.19.7"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-A4OJNZHCERV2Sd/XQgt29xeBP+8PEIrpk22QypeVQ/A="; + sha256 = "sha256-wnYLZ/mSNco8lIr6zmVoGGVGnOBWAzXgB+uy5U5Os4A="; }; - vendorSha256 = "sha256-k8FvHvo2qrQcYNKXH0LiAjaW+J+BKEflhjaulQ3SRMI="; + vendorSha256 = "sha256-nNZLL8S32vGfQkDD+vI4ovUvZZgGzgQmb8BAGBb+R4k="; subPackages = [ "." ]; From 8ecdb52267295647b272c236e226e2bcbfd6f14e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 13:49:36 +0000 Subject: [PATCH 030/161] graphia: 3.0 -> 3.1 --- pkgs/applications/science/misc/graphia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index c397e19fcf0c..ce712ef182b0 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "graphia"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "graphia-app"; repo = "graphia"; rev = version; - sha256 = "sha256-9JIVMtu8wlux7vIapOQQIemE7ehIol2XZuIvwLfB8fY="; + sha256 = "sha256-mqoK5y2h0JSiE9VtwawCgc1+qETzuefLVUpgFPcNFnk="; }; patches = [ From 287c39936273cbc9fff56fb9c9e49bec5d42f51c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 18:36:18 +0000 Subject: [PATCH 031/161] kubeconform: 0.4.13 -> 0.4.14 --- pkgs/applications/networking/cluster/kubeconform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index 07d15feddda5..28db974980e8 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.4.13"; + version = "0.4.14"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hKsGti04pUZj02uzah7ccImmg/qn31ceVfk11aTa9rk="; + sha256 = "sha256-iLZhd1e4i6omyGhOvRJ/VsHehpAPfPHnypXru5Ruv0o="; }; vendorSha256 = null; From 490151083e4d739960f2114f240a3ab844a63253 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 19:41:19 +0000 Subject: [PATCH 032/161] leo-editor: 6.6-b2 -> 6.6.3 --- pkgs/applications/editors/leo-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index efe431c33966..1f4fbdf4edde 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.6-b2"; + version = "6.6.3"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-oUOsAYcxknG+bao76bzPhStO1m08pMWTEEiG2rLkklA="; + sha256 = "sha256-QBK+4V9Nff3K6KcJ1PEyU0Ohn3cLawKe/5sR4Tih0dM="; }; dontBuild = true; From f7c4f709fd08543705f95b60bc6d0ec77314a649 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 23:14:39 +0000 Subject: [PATCH 033/161] mark: 8.0 -> 8.3 --- pkgs/tools/text/mark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index 9c7f4e2b385d..7f77f5767c66 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "8.0"; + version = "8.3"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-1cJt/+OClc7YxSy9kGLQrREckjDvMIBdzet9SJGPb84="; + sha256 = "sha256-HU7kPzcRhptMGuqsrHOTT3yZ9ALQGBK/cYZ8KbIO0RU="; }; - vendorSha256 = "sha256-a+pWSt24+aNABcLhiiFy+g/imBQtiqliAAWWkjPolxU="; + vendorSha256 = "sha256-Q628lMGV/Ys8BC5zMq3xXgmj74NYHQmP0IrMU5gyyMw="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 0f2b280b275b824b5ef57f1125818850059c31de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 13:49:14 +0000 Subject: [PATCH 034/161] oapi-codegen: 1.9.1 -> 1.11.0 --- pkgs/tools/networking/oapi-codegen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index 84327c8f5eef..8ca14ee60c02 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.9.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Po0HCAK9h1GWSfKzV+1j3ddikCNIULbywx501GvRT/Q="; + sha256 = "sha256-KeMtop91aTylBX95ZJQmveHaYDCYqcKMbPO9YDAfYoI="; }; - vendorSha256 = "sha256-GSNNOWhWpXRJEIzLoBci25sp9pu0W1mS18G8eFOsfhw="; + vendorSha256 = "sha256-Zt4a4riAzmXNn/mawkMqt9f5lmow1zqnWLiLLQsTG9M="; # Tests use network doCheck = false; From 79d65a8851703f2111df9ea95632c68e7ac6dab4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Jul 2022 14:30:51 +0000 Subject: [PATCH 035/161] bind: 9.18.4 -> 9.18.5 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index c5fab10b245c..b8838b2bfcb5 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.4"; + version = "9.18.5"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-8neuUBWaAMMA65JqnF1RlTA4qTa9gkLWkT37bqxCdh0="; + sha256 = "sha256-DO4HjXTwvcTsN0Q1Amsl3niS8mVAoYsioC73KKEdyuc="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From 735450e173f8e532d21e4e81ea377b40b04970ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 09:57:22 +0000 Subject: [PATCH 036/161] gnomeExtensions.arcmenu: 30 -> 35 --- pkgs/desktops/gnome/extensions/arcmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index be4738286794..74207e5bafe2 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "30"; + version = "35"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-BKV1x/MBqVeiqFzpXYt3y8zwK4f5rcGBwFZWqSSUarg="; + sha256 = "sha256-q869UCnekCHBbB0aGNmHl8Ln32hRWHLddu3oqIUinwo="; }; patches = [ From 82edfabb2909f52949584a94d4577531d25287d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 00:52:09 +0000 Subject: [PATCH 037/161] nss_wrapper: 1.1.11 -> 1.1.12 --- pkgs/development/libraries/nss_wrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index a4538aa370cc..a6974295690e 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nss_wrapper"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { url = "mirror://samba/cwrap/nss_wrapper-${version}.tar.gz"; - sha256 = "1q5l6w69yc71ly8gcbnkrcbnq6b64cbiiv99m0z5vn5lgwp36igv"; + sha256 = "sha256-zdBg/wnAO32i0wsMta00dSNNQ4rqJ5A9slwvFvVwIYY="; }; nativeBuildInputs = [ cmake pkg-config ]; From 99872acdebe5a7799b8e02b9cbeaa3e078a79b8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 05:28:59 +0000 Subject: [PATCH 038/161] phoronix-test-suite: 10.8.2 -> 10.8.4 --- pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index d6171bda5d8a..1456cb4b142f 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.8.2"; + version = "10.8.4"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-hmgTQ9IEFYMasW72w9HDF+I0XncZJeBpiukgoDqeqrY="; + sha256 = "sha256-HyCS1TbAoxk+/FPkpQ887mXA7xp40x5UBPHGY//3t/Q="; }; buildInputs = [ php ]; From 751df2de1f914e962761de7c0612c03ad13cec77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 06:08:34 +0000 Subject: [PATCH 039/161] pidgin: 2.14.8 -> 2.14.10 --- .../networking/instant-messengers/pidgin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 01e138485461..84f8f327cad9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -9,11 +9,11 @@ let unwrapped = stdenv.mkDerivation rec { pname = "pidgin"; - version = "2.14.8"; + version = "2.14.10"; src = fetchurl { url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; - sha256 = "1jjc15pfyw3012q5ffv7q4r88wv07ndqh0wakyxa2k0w4708b01z"; + sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA="; }; nativeBuildInputs = [ makeWrapper ]; From 29fb8273cc0518a27a54354f964f6d125916ecc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Reynier?= Date: Wed, 27 Jul 2022 17:57:00 +0200 Subject: [PATCH 040/161] fira-go: init at 1.001 --- pkgs/data/fonts/fira-go/default.nix | 34 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/data/fonts/fira-go/default.nix diff --git a/pkgs/data/fonts/fira-go/default.nix b/pkgs/data/fonts/fira-go/default.nix new file mode 100644 index 000000000000..2d5952523a60 --- /dev/null +++ b/pkgs/data/fonts/fira-go/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchzip }: + +let + pname = "fira-go"; + version = "1.001"; + user = "bBoxType"; + repo = "FiraGo"; + rev = "9882ba0851f88ab904dc237f250db1d45641f45d"; +in +fetchzip { + name = "${pname}-${version}"; + + url = "https://github.com/${user}/${repo}/archive/${rev}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype + mv $out/Fonts/FiraGO_OTF_1001/{Roman,Italic}/*.otf \ + $out/share/fonts/opentype + rm -r $out/{Fonts,'Technical Report PDF',OFL.txt,README.md,*.pdf} + ''; + + sha256 = "sha256-MDGRba1eao/yVzSuncJ/nvCG8cpdrI4roVPI1G9qCbU="; + + meta = with lib; { + homepage = "https://bboxtype.com/typefaces/FiraGO"; + description = '' + Font with the same glyph set as Fira Sans 4.3 and additionally + supports Arabic, Devenagari, Georgian, Hebrew and Thai + ''; + license = licenses.ofl; + maintainers = [ maintainers.loicreynier ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaf2fe0d66c9..54c3eb3e085d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24894,6 +24894,8 @@ with pkgs; fira-code = callPackage ../data/fonts/fira-code { }; fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { }; + fira-go = callPackage ../data/fonts/fira-go { }; + fira-mono = callPackage ../data/fonts/fira-mono { }; flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { From 2d6481a4fd35069c271bbb2967a4c59989b010fc Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Wed, 3 Aug 2022 09:11:51 -0400 Subject: [PATCH 041/161] mangohud: statically link spdlog Works around bug in pressure-vessel where it wasn't including necessary vulkan layer dependencies defined through DT_RUNPATH in the sandbox. https://github.com/ValveSoftware/steam-runtime/issues/511 --- pkgs/tools/graphics/mangohud/default.nix | 32 +++++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index e62cfa6b8a80..28adf3689607 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -27,7 +27,6 @@ , vulkan-loader , libXNVCtrl , wayland -, spdlog , glew , glfw , nlohmann_json @@ -51,6 +50,27 @@ let hash = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18="; }; }; + + # Derived from subprojects/spdlog.wrap + # + # NOTE: We only statically link spdlog due to a bug in pressure-vessel: + # https://github.com/ValveSoftware/steam-runtime/issues/511 + # + # Once this fix is released upstream, we should switch back to using + # the system provided spdlog + spdlog = rec { + version = "1.8.5"; + src = fetchFromGitHub { + owner = "gabime"; + repo = "spdlog"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-D29jvDZQhPscaOHlrzGN1s7/mXlcsovjbqYpXd7OM50="; + }; + patch = fetchurl { + url = "https://wrapdb.mesonbuild.com/v2/spdlog_${version}-1/get_patch"; + sha256 = "sha256-PDjyddV5KxKGORECWUMp6YsXc3kks0T5gxKrCZKbdL4="; + }; + }; in stdenv.mkDerivation rec { pname = "mangohud"; version = "0.6.7-1"; @@ -69,7 +89,7 @@ in stdenv.mkDerivation rec { postUnpack = ''( cd "$sourceRoot/subprojects" cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} - unzip ${imgui.patch} + cp -R --no-preserve=mode,ownership ${spdlog.src} spdlog-${spdlog.version} )''; patches = [ @@ -112,11 +132,16 @@ in stdenv.mkDerivation rec { }) ]; + postPatch = ''( + cd subprojects + unzip ${imgui.patch} + unzip ${spdlog.patch} + )''; + mesonFlags = [ "-Duse_system_vulkan=enabled" "-Dvulkan_datadir=${vulkan-headers}/share" "-Dwith_wayland=enabled" - "-Duse_system_spdlog=enabled" ] ++ lib.optionals gamescopeSupport [ "-Dmangoapp_layer=true" "-Dmangoapp=true" @@ -140,7 +165,6 @@ in stdenv.mkDerivation rec { libX11 libXNVCtrl wayland - spdlog ] ++ lib.optionals gamescopeSupport [ glew glfw From dc0a907d87a457ab06a69463d3c0afd045b74a3c Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 16 Jan 2021 14:41:53 -0500 Subject: [PATCH 042/161] zynaddsubfx: use Zyn-Fusion logo for zest build Derived from https://raw.githubusercontent.com/mruby-zest/mruby-zest/ea4894620bf80ae59593b5d404b950d436a91e6c/example/ZynLogo.qml --- pkgs/applications/audio/zynaddsubfx/ZynLogo.svg | 6 ++++++ pkgs/applications/audio/zynaddsubfx/default.nix | 8 ++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/audio/zynaddsubfx/ZynLogo.svg diff --git a/pkgs/applications/audio/zynaddsubfx/ZynLogo.svg b/pkgs/applications/audio/zynaddsubfx/ZynLogo.svg new file mode 100644 index 000000000000..8a1bc56d0874 --- /dev/null +++ b/pkgs/applications/audio/zynaddsubfx/ZynLogo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index e738a0fbcbe5..9b09040fc8ce 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -102,6 +102,14 @@ in stdenv.mkDerivation rec { runHook postCheck ''; + # Use Zyn-Fusion logo for zest build + # Manually derived from https://github.com/mruby-zest/mruby-zest-build/blob/3.0.6/src/mruby-zest/example/ZynLogo.qml#L65-L97 + postInstall = lib.optionalString (guiModule == "zest") '' + rm -r "$out/share/pixmaps" + mkdir -p "$out/share/icons/hicolor/scalable/apps" + cp ${./ZynLogo.svg} "$out/share/icons/hicolor/scalable/apps/zynaddsubfx.svg" + ''; + # When building with zest GUI, patch plugins # and standalone executable to properly locate zest postFixup = lib.optionalString (guiModule == "zest") '' From 5b44e6010db36f0213bb422da67daec9dae90308 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 4 Aug 2022 17:19:02 -0400 Subject: [PATCH 043/161] zynaddsubfx: separate doc output --- pkgs/applications/audio/zynaddsubfx/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 9b09040fc8ce..1e79db8bf679 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -63,6 +63,8 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; + outputs = [ "out" "doc" ]; + postPatch = '' substituteInPlace src/Misc/Config.cpp --replace /usr $out ''; From 6c3be14afeb6d8fb35bece14feae092469a4c9dc Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 4 Aug 2022 17:21:09 -0400 Subject: [PATCH 044/161] zynaddsubfx: use for loop to set rpath for vst libraries --- pkgs/applications/audio/zynaddsubfx/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 1e79db8bf679..60447f360fbe 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -115,11 +115,9 @@ in stdenv.mkDerivation rec { # When building with zest GUI, patch plugins # and standalone executable to properly locate zest postFixup = lib.optionalString (guiModule == "zest") '' - patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so")" \ - "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so" - - patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/vst/ZynAddSubFX.so")" \ - "$out/lib/vst/ZynAddSubFX.so" + for lib in "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so" "$out/lib/vst/ZynAddSubFX.so"; do + patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$lib")" "$lib" + done wrapProgram "$out/bin/zynaddsubfx" \ --prefix PATH : ${mruby-zest} \ From fbaac3ad4fbce6b9abaa031c1dddf96640f27a13 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 4 Aug 2022 17:57:51 -0400 Subject: [PATCH 045/161] zynaddsubfx: disable PortChecker test when building with lashSupport --- pkgs/applications/audio/zynaddsubfx/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 60447f360fbe..101d4dc93797 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -93,11 +93,13 @@ in stdenv.mkDerivation rec { # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 checkPhase = let - # Tests fail on aarch64 - disabledTests = lib.optionals stdenv.isAarch64 [ - "MessageTest" - "UnisonTest" - ]; + disabledTests = + # PortChecker test fails when lashSupport is enabled because + # zynaddsubfx takes to long to start trying to connect to lash + lib.optionals lashSupport [ "PortChecker" ] + + # Tests fail on aarch64 + ++ lib.optionals stdenv.isAarch64 [ "MessageTest" "UnisonTest" ]; in '' runHook preCheck ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' From 976468d6627d9736a1000933cafe804319829837 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Aug 2022 01:58:21 +0000 Subject: [PATCH 046/161] oil: 0.12.0 -> 0.12.3 --- pkgs/shells/oil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 57b5d085c340..8702e83cae90 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.12.0"; + version = "0.12.3"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-1zwGfM17SWWIvQ19cSbIfiLRaq+Ee1r94GPJWJEPoP8="; + hash = "sha256-M8gklc9crdVkQk9vzxO4tG809O0uHOPvvq1l1tzoPt8="; }; postPatch = '' From 1369d3edb72fa17967a0ac465bca6774fc9a6137 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Aug 2022 12:58:53 +0200 Subject: [PATCH 047/161] MMA: 20.12 -> 21.09 --- pkgs/applications/audio/MMA/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 3034de750cf9..8f54e6e29710 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, python3, alsa-utils, timidity }: - stdenv.mkDerivation rec { - version = "20.12"; +stdenv.mkDerivation rec { + version = "21.09"; pname = "mma"; src = fetchurl { url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; - sha256 = "18k0hwlqky5x4y461fxmw77gvz7z8jyrvxicrqphsgvwwinzy732"; + sha256 = "sha256-5YzdaZ499AGiKAPUsgBCj3AQ9s0WlfgAbHhOQSOLLO8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -38,8 +38,7 @@ cp util/mup2mma.py $out/bin/mup2mma cp util/pg2mma.py $out/bin/pg2mma cp util/synthsplit.py $out/bin/mma-synthsplit - cp -r {docs,egs,includes,lib,MMA,text} $out/share/mma - rmdir $out/share/mma/includes/aria + cp -r {docs,egs,includes,lib,MMA,text,plugins} $out/share/mma cp util/README.* $out/share/mma/docs mv $out/share/mma/docs/man/mma-libdoc.8 $out/share/man/man8 @@ -61,8 +60,9 @@ ''; meta = { - description = "Creates MIDI tracks for a soloist to perform over from a user supplied file containing chords"; - homepage = "https://www.mellowood.ca/mma/index.html"; + description = + "Creates MIDI tracks for a soloist to perform over from a user supplied file containing chords"; + homepage = "https://www.mellowood.ca/mma/index.html"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; From 4df9e2647a8c57f9da2ab8cd332181ac86f28c0a Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Aug 2022 17:05:16 +0200 Subject: [PATCH 048/161] lsp-plugins: 1.2.1 -> 1.2.2 --- .../audio/lsp-plugins/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 5fc0a94d7576..c0da4fd228a0 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchurl, pkg-config, makeWrapper , libsndfile, jack2 , libGLU, libGL, lv2, cairo -, ladspaH, php }: +, ladspaH, php, libXrandr }: stdenv.mkDerivation rec { - pname = "lsp-plugins"; - version = "1.2.1"; + pname = "lsp-plugins"; + version = "1.2.2"; - src = fetchurl { - url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-wHibZJbrgy7t0z2rRDe1FUAG38BW/dR0JgoKVWYCn60="; - }; + src = fetchurl { + url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; + sha256 = "sha256-qIakDWNs8fQmlw/VHwTET2LmIvI+6I6zK88bmsWF4VI="; + }; - nativeBuildInputs = [ pkg-config php makeWrapper ]; - buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH ]; + nativeBuildInputs = [ pkg-config php makeWrapper ]; + buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH libXrandr ]; - makeFlags = [ - "PREFIX=${placeholder "out"}" + makeFlags = [ + "PREFIX=${placeholder "out"}" ]; NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; From dd80fa1e9bed5af95fe2a02109f1852d447c9471 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 28 Jul 2022 20:12:24 +0200 Subject: [PATCH 049/161] nixos/filesystems: skip fsck for more filesystems This commit prevents warning messages like ``` systemd-fstab-generator: Checking was requested for "/path/to/device", but it is not a device. ``` in `dmesg` when one of the filesystems 9p, cifs, prl_fs or vmhgfs is added to the list of `fileSystems`. This happens because the generated /etc/fstab entry contains a non-zero fsck pass number, which doesn't make sense for these filesystems. --- nixos/modules/tasks/filesystems.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index c1e96e7aede7..318740a44f4a 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -279,7 +279,7 @@ in environment.etc.fstab.text = let - fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" ]; + fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" "9p" "cifs" "prl_fs" "vmhgfs" ]; isBindMount = fs: builtins.elem "bind" fs.options; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs; # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces From 9d8e6c29d2fb517e05d5b14f3c758f8e59e66356 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 6 Aug 2022 17:07:09 +0100 Subject: [PATCH 050/161] python3Packages.pyunbound: inherit patches from unbound if present --- pkgs/tools/networking/unbound/python.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index 067f5d2b417b..94f2374d904d 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -6,6 +6,7 @@ in stdenv.mkDerivation rec { pname = "pyunbound"; inherit (unbound) version src; + patches = unbound.patches or null; nativeBuildInputs = [ swig ]; From 62e6c1a561ec39ca23145f25263a5f86aad727da Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 6 Aug 2022 17:21:45 +0100 Subject: [PATCH 051/161] unbound: add gnutls to passthru.tests --- pkgs/tools/networking/unbound/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index cf1c7f717e66..a472bd258ed8 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -39,6 +39,9 @@ , withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP , withPythonModule ? false , libnghttp2 + +# for passthru.tests +, gnutls }: stdenv.mkDerivation rec { @@ -142,7 +145,10 @@ stdenv.mkDerivation rec { (pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") (builtins.filter (p: p != null) buildInputs); - passthru.tests = nixosTests.unbound; + passthru.tests = { + inherit gnutls; + nixos-test = nixosTests.unbound; + }; meta = with lib; { description = "Validating, recursive, and caching DNS resolver"; From 22c9c6cb712e42a36bc00cb562e5bb866a866858 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 6 Aug 2022 17:23:09 +0100 Subject: [PATCH 052/161] unbound: add comment clarifying unbound's python support --- pkgs/tools/networking/unbound/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index a472bd258ed8..16530909c002 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -37,6 +37,8 @@ # Avoid .lib depending on lib.getLib openssl # The build gets a little hacky, so in some cases we disable this approach. , withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP +# enable support for python plugins in unbound: note this is distinct from pyunbound +# see https://unbound.docs.nlnetlabs.nl/en/latest/developer/python-modules.html , withPythonModule ? false , libnghttp2 From 9fce752330987d73a304b9fbf3759aced9e41d0d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 8 Aug 2022 14:31:17 +0200 Subject: [PATCH 053/161] texstudio: 4.2.3 -> 4.3.0 --- pkgs/applications/editors/texstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 89896b9dd85e..7f34fc6e0726 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.2.3"; + version = "4.3.0"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "19z9dx8258qbjyzgskkg0xdn88mvx191y1sz4nk15yxsdyf2z3p8"; + hash = "sha256-nw6LG8U4ne5nngmE7F4yFE8mTEvaRSMfwwOxg2TnAdA="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; From 8edb7f27c3730d41f4c3cbcb47ef3e76c23d89b7 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 8 Aug 2022 18:35:28 +0200 Subject: [PATCH 054/161] caffeine-ng: don't double wrap --- pkgs/tools/X11/caffeine-ng/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index 619bd55b6f45..5aab492c75e8 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -45,7 +45,6 @@ in buildPythonApplication rec { buildInputs = [ libappindicator-gtk3 libnotify - gobject-introspection gtk3 ]; @@ -60,6 +59,8 @@ in buildPythonApplication rec { ]; doCheck = false; # There are no tests. + dontWrapGApps = true; + strictDeps = false; postInstall = '' cp -r share $out/ @@ -69,10 +70,13 @@ in buildPythonApplication rec { ln -s $out/${python3.sitePackages}/etc $out/etc glib-compile-schemas --strict $out/share/glib-2.0/schemas + ''; + preFixup = '' gappsWrapperArgs+=( --prefix PATH : ${lib.makeBinPath [ procps xautolock xscreensaver xfce.xfconf xset ]} ) + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; meta = with lib; { From 9778f0814155b228baa880438cff95ea50e2f622 Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Mon, 8 Aug 2022 21:49:54 +0200 Subject: [PATCH 055/161] pythonPackages.nix-prefetch-github: 5.1.2 -> 5.2.0 --- .../python-modules/nix-prefetch-github/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 7ef63348dfb3..41f5dbfc2f64 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "5.1.2"; + version = "5.2.0"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "GHUH3Oog800qrdgXs5AEa4O6ovZ1LT0k3P4YwEHfwlY="; + sha256 = "MDyoO1mJaTh+y9XDfhRcKHQcSJcsdKB9g1d+ede4znU="; }; checkInputs = [ git which ]; From 40ba925d3ebda1e91a24feed00ffd75a0356215a Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Mon, 8 Aug 2022 21:07:30 +0100 Subject: [PATCH 056/161] wails: 2.0.0-beta.42 -> 2.0.0-beta.43 --- pkgs/development/tools/wails/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 2ff94ae2d744..97848a72d122 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -9,22 +9,21 @@ , gtk3 , webkitgtk , nodejs -, upx , zlib }: buildGoModule rec { pname = "wails"; - version = "2.0.0-beta.42"; + version = "2.0.0-beta.43"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZfzaDUUM3W2ZvmLJufeVZ3eK/grvSxbKbsReV7BmcGA="; + sha256 = "sha256-IX60xXU1sV39EI2nC/oL+s/RfE0apSJ2nMza6Av864I="; } + "/v2"; - vendorSha256 = "sha256-qmj7pZV9VaxWcC7EgbKZOjlDj6/66Qf5d222aj4TViw="; + vendorSha256 = "sha256-KB6fzyeeHCl164ZnDIy9auUC7Qzm8rVMo3XxXbeYCgY="; proxyVendor = true; @@ -49,7 +48,6 @@ buildGoModule rec { gtk3 webkitgtk nodejs - upx ]; ldflags = [ @@ -60,7 +58,7 @@ buildGoModule rec { # As Wails calls a compiler, certain apps and libraries need to be made available. postFixup = '' wrapProgram $out/bin/wails \ - --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs upx ]} \ + --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 webkitgtk ]} \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" From 10a43777e05970d00ce6b02de161d9d877f88ee5 Mon Sep 17 00:00:00 2001 From: "M. A" Date: Tue, 9 Aug 2022 12:47:43 +0000 Subject: [PATCH 057/161] snipe-it: 6.0.8 -> 6.0.9 https://github.com/snipe/snipe-it/releases/tag/v6.0.9 --- pkgs/servers/web-apps/snipe-it/default.nix | 4 +- .../web-apps/snipe-it/php-packages.nix | 346 +++++++++--------- 2 files changed, 170 insertions(+), 180 deletions(-) diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix index 9da05a269c4f..031b9f10f33b 100644 --- a/pkgs/servers/web-apps/snipe-it/default.nix +++ b/pkgs/servers/web-apps/snipe-it/default.nix @@ -18,13 +18,13 @@ let in package.override rec { pname = "snipe-it"; - version = "6.0.8"; + version = "6.0.9"; src = fetchFromGitHub { owner = "snipe"; repo = pname; rev = "v${version}"; - sha256 = "01pjrx1x4xy05k292mx3w0vw9q565jg2n80hma2ajw3iknmyk91k"; + sha256 = "1i6aqq75xkl7y6ggw11b7rls2hl3jvnpygjzmik5q2b274s1aamp"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/snipe-it/php-packages.nix b/pkgs/servers/web-apps/snipe-it/php-packages.nix index 6ba3606332d3..28a69dba7d56 100644 --- a/pkgs/servers/web-apps/snipe-it/php-packages.nix +++ b/pkgs/servers/web-apps/snipe-it/php-packages.nix @@ -15,10 +15,10 @@ let "arietimmerman/laravel-scim-server" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "arietimmerman-laravel-scim-server-10be959682d47bb8c78255168262a7cbb7586146"; + name = "arietimmerman-laravel-scim-server-d0e3d7c0b5da2ec76283b8a2fa2e672a91596509"; src = fetchurl { - url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/10be959682d47bb8c78255168262a7cbb7586146"; - sha256 = "0sak3h8hp6wdjpkq3y8a7q1gp6h6a7wgdcj2iqag633wvhbzsx56"; + url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/d0e3d7c0b5da2ec76283b8a2fa2e672a91596509"; + sha256 = "0xznsbdph32q1nx5ibl90gfqa7j0bj0ikcvz8hfpxxk967k1ayfj"; }; }; }; @@ -45,10 +45,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-007ddbbded7b753c2ceda61f3648774597a2615f"; + name = "aws-aws-sdk-php-8f8742caa42b260950320c98ddc5da4926e2373d"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/007ddbbded7b753c2ceda61f3648774597a2615f"; - sha256 = "1pzyncmi951p3bmjqijjbpxw0phymaqflkplzvrz77d66dkx93nd"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/8f8742caa42b260950320c98ddc5da4926e2373d"; + sha256 = "0z87ncxqvcs6bjp1b0dw1gib0f1k35sxzag8vzcd4ssh9n1m29gm"; }; }; }; @@ -65,20 +65,20 @@ let "barryvdh/laravel-debugbar" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-debugbar-b96f9820aaf1ff9afe945207883149e1c7afb298"; + name = "barryvdh-laravel-debugbar-3372ed65e6d2039d663ed19aa699956f9d346271"; src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b96f9820aaf1ff9afe945207883149e1c7afb298"; - sha256 = "0ns718nw578b0ii9jra8b2x5nvivgc9jpzmkxa8m766br1g8hsw5"; + url = "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/3372ed65e6d2039d663ed19aa699956f9d346271"; + sha256 = "08ll8z25mbq21q8gxdlgdb0pymx7z3xxc1la68m879l5r2ddhi05"; }; }; }; "barryvdh/laravel-dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-dompdf-e3f429e97087b2ef19b83e5ed313f080f2477685"; + name = "barryvdh-laravel-dompdf-1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/e3f429e97087b2ef19b83e5ed313f080f2477685"; - sha256 = "1gwcv7pdbca3qk5pvb96pjilbpmgf76ppn733986mb6n55yab9g8"; + url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; + sha256 = "0xvaq6mp9s8nxlpfisa50fr8rjb6vmivxdbr985q9vydadh1dsv2"; }; }; }; @@ -125,20 +125,20 @@ let "doctrine/annotations" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-annotations-5b668aef16090008790395c02c893b1ba13f7e08"; + name = "doctrine-annotations-648b0343343565c4a056bfc8392201385e8d89f0"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08"; - sha256 = "129dixpipqfi55yq1rcp7dwj1yl1w70i462rs16ma4bn5vzxqz5s"; + url = "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0"; + sha256 = "0mkxq1yaqp6an2gjcgsmg7hq37mrwcj27f94sfkfxq9x6qh02k57"; }; }; }; "doctrine/cache" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-cache-4cf401d14df219fa6f38b671f5493449151c9ad8"; + name = "doctrine-cache-56cd022adb5514472cb144c087393c1821911d09"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/cache/zipball/4cf401d14df219fa6f38b671f5493449151c9ad8"; - sha256 = "1hklk08cld4i5113f0a87778xmqnivkrck718wjbp1z6k76sbnsh"; + url = "https://api.github.com/repos/doctrine/cache/zipball/56cd022adb5514472cb144c087393c1821911d09"; + sha256 = "1ri5pwrnq8pxjv8ljscvlaqzjj7ii87420af4dq133qm35jn4ffr"; }; }; }; @@ -165,10 +165,10 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-9e7f76dd1cde81c62574fdffa5a9c655c847ad21"; + name = "doctrine-dbal-9f79d4650430b582f4598fe0954ef4d52fbc0a8a"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/9e7f76dd1cde81c62574fdffa5a9c655c847ad21"; - sha256 = "0w1j3cj1dw7fyk05ywc2k0vz1laqwj2886hhi8y33vjwi2lp1lw6"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a"; + sha256 = "0jf1whbf0d5kizrlzdm29ld5lrk4fgmayr239vyl2dmdzzxyvkhf"; }; }; }; @@ -235,20 +235,20 @@ let "doctrine/reflection" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-reflection-fa587178be682efe90d005e3a322590d6ebb59a5"; + name = "doctrine-reflection-1034e5e71f89978b80f9c1570e7226f6c3b9b6fb"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/reflection/zipball/fa587178be682efe90d005e3a322590d6ebb59a5"; - sha256 = "1jn3bbzv0pn16aw0kkg0l765wi49zpf5vpirqwmw3viqj9bgj1b5"; + url = "https://api.github.com/repos/doctrine/reflection/zipball/1034e5e71f89978b80f9c1570e7226f6c3b9b6fb"; + sha256 = "08n0m6z8b66b0v8awl1w8s8ncg61sa25273ba42fbjmn24b3h6mp"; }; }; }; "dompdf/dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dompdf-dompdf-5031045d9640b38cfc14aac9667470df09c9e090"; + name = "dompdf-dompdf-79573d8b8a141ec8a17312515de8740eed014fa9"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/dompdf/zipball/5031045d9640b38cfc14aac9667470df09c9e090"; - sha256 = "1ciw3mc6pq3rwpzsgc71gdbwppqjdfcr0fhq3435c27ni5y8z4c5"; + url = "https://api.github.com/repos/dompdf/dompdf/zipball/79573d8b8a141ec8a17312515de8740eed014fa9"; + sha256 = "0glv4fhzk674jgk1v9rkhb4859x5h1aspr63qdn7ajls27c582l5"; }; }; }; @@ -325,10 +325,10 @@ let "facade/ignition" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "facade-ignition-1d71996f83c9a5a7807331b8986ac890352b7a0c"; + name = "facade-ignition-6acd82e986a2ecee89e2e68adfc30a1936d1ab7c"; src = fetchurl { - url = "https://api.github.com/repos/facade/ignition/zipball/1d71996f83c9a5a7807331b8986ac890352b7a0c"; - sha256 = "0zc9x2d597709rp5fzsbx5gqn48qcsw70h1a63cqrw1nl95392gs"; + url = "https://api.github.com/repos/facade/ignition/zipball/6acd82e986a2ecee89e2e68adfc30a1936d1ab7c"; + sha256 = "1mxn6kqwbgd3vs36ckwydpx7kvjky6fvnhmbvn0c2zp0hsliq7rw"; }; }; }; @@ -345,10 +345,10 @@ let "fideloper/proxy" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "fideloper-proxy-c073b2bd04d1c90e04dc1b787662b558dd65ade0"; + name = "fideloper-proxy-a751f2bc86dd8e6cfef12dc0cbdada82f5a18750"; src = fetchurl { - url = "https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0"; - sha256 = "05jzgjj4fy5p1smqj41b5qxj42zn0mnczvsaacni4fmq174mz4gy"; + url = "https://api.github.com/repos/fideloper/TrustedProxy/zipball/a751f2bc86dd8e6cfef12dc0cbdada82f5a18750"; + sha256 = "11whawpjkiphdfpfwm5c2v3finc3apl9gp8b4lwq76370i41plcf"; }; }; }; @@ -365,10 +365,10 @@ let "firebase/php-jwt" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "firebase-php-jwt-d28e6df83830252650da4623c78aaaf98fb385f3"; + name = "firebase-php-jwt-018dfc4e1da92ad8a1b90adc4893f476a3b41cb8"; src = fetchurl { - url = "https://api.github.com/repos/firebase/php-jwt/zipball/d28e6df83830252650da4623c78aaaf98fb385f3"; - sha256 = "0lp9z27mlav8bdcy69d3br93azjnwjimz98w19h6pykp7939aaap"; + url = "https://api.github.com/repos/firebase/php-jwt/zipball/018dfc4e1da92ad8a1b90adc4893f476a3b41cb8"; + sha256 = "1jzri64bl3hiwah9nk3yq8nfjfn4z0xb0znp1dwh65qzjy54f0jh"; }; }; }; @@ -395,10 +395,10 @@ let "guzzlehttp/guzzle" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-ac1ec1cd9b5624694c3a40be801d94137afb12b4"; + name = "guzzlehttp-guzzle-1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4"; - sha256 = "0bpgi47jc2d1ca0h62ahg9bpkh355azncwgnzcb2vsaldcm4g27s"; + url = "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"; + sha256 = "0a8491bb72y61r3ghqn32kabsj8rxhj9pddnkkr14x3wbc10zfr4"; }; }; }; @@ -415,20 +415,20 @@ let "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-c94a94f120803a18554c1805ef2e539f8285f9a2"; + name = "guzzlehttp-psr7-13388f00956b1503577598873fffb5ae994b5737"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2"; - sha256 = "05q47cx2dvqxxi5kan0d3q956lqrf3rnan5qbwc36hk4pb5n1sqs"; + url = "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737"; + sha256 = "05vc1q903nxfg11y9mcnlg253lm5d81jjg6wv76hjiwx8m47lbac"; }; }; }; "intervention/image" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "intervention-image-744ebba495319501b873a4e48787759c72e3fb8c"; + name = "intervention-image-04be355f8d6734c826045d02a1079ad658322dad"; src = fetchurl { - url = "https://api.github.com/repos/Intervention/image/zipball/744ebba495319501b873a4e48787759c72e3fb8c"; - sha256 = "1h0w1gmnsb54k2y12vdhardssz9l3fqddln08fx9spwva1w4ms59"; + url = "https://api.github.com/repos/Intervention/image/zipball/04be355f8d6734c826045d02a1079ad658322dad"; + sha256 = "1cbg43hm2jgwb7gm1r9xcr4cpx8ng1zr93zx6shk9xhjlssnv0bx"; }; }; }; @@ -445,10 +445,10 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-2af2314989845db68dfbb65a54b8748ffaf26204"; + name = "laravel-framework-96aecced5126d48e277e5339193c376fe82b6565"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/2af2314989845db68dfbb65a54b8748ffaf26204"; - sha256 = "1q43sxp927sgzgbgvszbqmf77fi350l748hya33bdwl5f3w5rigb"; + url = "https://api.github.com/repos/laravel/framework/zipball/96aecced5126d48e277e5339193c376fe82b6565"; + sha256 = "1s4bcjpfsjafqigj28xbwa3bycs2cd1h4jnbpn9c9zj87w4smhzm"; }; }; }; @@ -475,10 +475,10 @@ let "laravel/serializable-closure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-serializable-closure-9e4b005daa20b0c161f3845040046dc9ddc1d74e"; + name = "laravel-serializable-closure-09f0e9fb61829f628205b7c94906c28740ff9540"; src = fetchurl { - url = "https://api.github.com/repos/laravel/serializable-closure/zipball/9e4b005daa20b0c161f3845040046dc9ddc1d74e"; - sha256 = "1arjkh7rxjnifcccqrdyby308fg3vlp5mfz5bhhk9cs9q1xhrhna"; + url = "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540"; + sha256 = "1b0kdx0cs43ci4pyhhv874k5i0k42iiizz1mz0f6wk8lpzhk0r6r"; }; }; }; @@ -505,10 +505,10 @@ let "laravel/ui" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-ui-f11d295de1508c5bb56206a620b00b6616de414c"; + name = "laravel-ui-65ec5c03f7fee2c8ecae785795b829a15be48c2c"; src = fetchurl { - url = "https://api.github.com/repos/laravel/ui/zipball/f11d295de1508c5bb56206a620b00b6616de414c"; - sha256 = "1cjhzmvl5wwf2q46di5fnqf9kysfib4rfqf7h9pz8w7p74nl3r5c"; + url = "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c"; + sha256 = "0hr8kkbxvxxidnw86r1i92938wajhskv68zjn1627h1i16b10ysm"; }; }; }; @@ -545,10 +545,10 @@ let "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-cb36fee279f7fca01d5d9399ddd1b37e48e2eca1"; + name = "league-commonmark-155ec1c95626b16fda0889cf15904d24890a60d5"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/commonmark/zipball/cb36fee279f7fca01d5d9399ddd1b37e48e2eca1"; - sha256 = "1djp6mzibix05ymi5zx8f5mg41690hk5n9k70n58fdna35sjbby6"; + url = "https://api.github.com/repos/thephpleague/commonmark/zipball/155ec1c95626b16fda0889cf15904d24890a60d5"; + sha256 = "1bl4f0s6adgilly5yivcyg6ya42f173vc734518vjrdmzzh1wk2m"; }; }; }; @@ -595,10 +595,10 @@ let "league/flysystem-aws-s3-v3" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-aws-s3-v3-4e25cc0582a36a786c31115e419c6e40498f6972"; + name = "league-flysystem-aws-s3-v3-af286f291ebab6877bac0c359c6c2cb017eb061d"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972"; - sha256 = "1q2vkgyaz7h6z3q0z3v3l5rsvhv4xc45prgzr214cgm656i2h1ab"; + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af286f291ebab6877bac0c359c6c2cb017eb061d"; + sha256 = "1dyj1cvf2pbvkdw9i53qg6lycxv0di85qnjzcvy5lphrxambifxy"; }; }; }; @@ -635,10 +635,10 @@ let "league/uri" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-uri-c68ca445abb04817d740ddd6d0b3551826ef0c5a"; + name = "league-uri-2d7c87a0860f3126a39f44a8a9bf2fed402dcfea"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/uri/zipball/c68ca445abb04817d740ddd6d0b3551826ef0c5a"; - sha256 = "0sk98yk5q1qj97hsglgfsg7chbnf5hi1nhd5m09704z4b8jrcy6p"; + url = "https://api.github.com/repos/thephpleague/uri/zipball/2d7c87a0860f3126a39f44a8a9bf2fed402dcfea"; + sha256 = "1cibnnh81jvkn28050scyldnzbshqhy5464gqmdfw0ar1a6bz545"; }; }; }; @@ -655,10 +655,10 @@ let "livewire/livewire" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "livewire-livewire-9ea6237760f627b3b6a05d15137880780ac843b5"; + name = "livewire-livewire-020ad095cf1239138b097d22b584e2701ec3edfb"; src = fetchurl { - url = "https://api.github.com/repos/livewire/livewire/zipball/9ea6237760f627b3b6a05d15137880780ac843b5"; - sha256 = "11x48k1xprdp2xaihgskc1cxpjlg1ri1dkza3shzsaq883d9d6vy"; + url = "https://api.github.com/repos/livewire/livewire/zipball/020ad095cf1239138b097d22b584e2701ec3edfb"; + sha256 = "0kklhhk351fbw38dw810si3gpzppjnm8hn9f6h8arxhcgxc8vnx7"; }; }; }; @@ -675,10 +675,10 @@ let "maennchen/zipstream-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "maennchen-zipstream-php-c4c5803cc1f93df3d2448478ef79394a5981cc58"; + name = "maennchen-zipstream-php-211e9ba1530ea5260b45d90c9ea252f56ec52729"; src = fetchurl { - url = "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/c4c5803cc1f93df3d2448478ef79394a5981cc58"; - sha256 = "0ggx4sb5w7aah7h645ad59gsn6r9an5y4f8xhgwbbjxndmgx34dq"; + url = "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/211e9ba1530ea5260b45d90c9ea252f56ec52729"; + sha256 = "02llnd0f72lmqhn84ggv2kkdk6968bg29wv196386dabf7ilq4wg"; }; }; }; @@ -735,10 +735,10 @@ let "monolog/monolog" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "monolog-monolog-247918972acd74356b0a91dfaa5adcaec069b6c0"; + name = "monolog-monolog-5579edf28aee1190a798bfa5be8bc16c563bd524"; src = fetchurl { - url = "https://api.github.com/repos/Seldaek/monolog/zipball/247918972acd74356b0a91dfaa5adcaec069b6c0"; - sha256 = "1rhldsdvm9s64b9qgnx610ad3wd28g1892ph3rf4fljnjd415hgh"; + url = "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524"; + sha256 = "014sys8bv57jbpag7xlc7vplc1qy4h5jppy258hpr0xfbh27cg3w"; }; }; }; @@ -775,10 +775,10 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-97a34af22bde8d0ac20ab34b29d7bfe360902055"; + name = "nesbot-carbon-a9000603ea337c8df16cc41f8b6be95a65f4d0f5"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055"; - sha256 = "0dagm5dr9pbyvxhmspdwmpwgnxf65mjk24a32cw8h5wqfn0p99i8"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/a9000603ea337c8df16cc41f8b6be95a65f4d0f5"; + sha256 = "0rjlq01108i309q9lyfv0vvb9vmsnqy5ylk9h8wvhd7916vw3jnc"; }; }; }; @@ -805,10 +805,10 @@ let "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-210577fe3cf7badcc5814d99455df46564f3c077"; + name = "nikic-php-parser-34bea19b6e03d8153165d8f30bba4c3be86184c1"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077"; - sha256 = "191ijb7bybqnl1jayx6bipqh91dc9acg9zsbh89fk4h1ff87b1qp"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1"; + sha256 = "1yj97j9cdx48566qwjl5q8hkjkrd1xl59aczb1scspxay37l9w72"; }; }; }; @@ -825,10 +825,10 @@ let "nyholm/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nyholm-psr7-1461e07a0f2a975a52082ca3b769ca912b816226"; + name = "nyholm-psr7-f734364e38a876a23be4d906a2a089e1315be18a"; src = fetchurl { - url = "https://api.github.com/repos/Nyholm/psr7/zipball/1461e07a0f2a975a52082ca3b769ca912b816226"; - sha256 = "1i6v8r9c2gxsjafyy03g339hkc0wcbsdlg47gy6rswg7qc1r91g1"; + url = "https://api.github.com/repos/Nyholm/psr7/zipball/f734364e38a876a23be4d906a2a089e1315be18a"; + sha256 = "0w8i5l1qg8dkc1zsyz1gpwn2awgkhlm295l1b8smmzabqdc65dcx"; }; }; }; @@ -855,10 +855,10 @@ let "paragonie/constant_time_encoding" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "paragonie-constant_time_encoding-9229e15f2e6ba772f0c55dd6986c563b937170a8"; + name = "paragonie-constant_time_encoding-58c3f47f650c94ec05a151692652a868995d2938"; src = fetchurl { - url = "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/9229e15f2e6ba772f0c55dd6986c563b937170a8"; - sha256 = "1cn71hyvjd100w0dyqibjxwkc8wn5525jmpv5fyh1ag04lr5ld90"; + url = "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938"; + sha256 = "0i9km0lzvc7df9758fm1p3y0679pzvr5m9x3mrz0d2hxlppsm764"; }; }; }; @@ -945,10 +945,10 @@ let "phpoffice/phpspreadsheet" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpoffice-phpspreadsheet-21e4cf62699eebf007db28775f7d1554e612ed9e"; + name = "phpoffice-phpspreadsheet-69991111e05fca3ff7398e1e7fca9ebed33efec6"; src = fetchurl { - url = "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/21e4cf62699eebf007db28775f7d1554e612ed9e"; - sha256 = "1zzhy52chi1ndypfv08y5hy7ibcwi2qjibdxp0f1d5smyj2y49fz"; + url = "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/69991111e05fca3ff7398e1e7fca9ebed33efec6"; + sha256 = "091g479mzh4w057m6v7xpn8i8l8k4abvvyd9l51c2sf7mskjz1n0"; }; }; }; @@ -985,10 +985,10 @@ let "pragmarx/google2fa" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "pragmarx-google2fa-26c4c5cf30a2844ba121760fd7301f8ad240100b"; + name = "pragmarx-google2fa-80c3d801b31fe165f8fe99ea085e0a37834e1be3"; src = fetchurl { - url = "https://api.github.com/repos/antonioribeiro/google2fa/zipball/26c4c5cf30a2844ba121760fd7301f8ad240100b"; - sha256 = "1jmc7s3hbczvb0h4kfmya67l969nfww3lmc4slvzsz0zd769434h"; + url = "https://api.github.com/repos/antonioribeiro/google2fa/zipball/80c3d801b31fe165f8fe99ea085e0a37834e1be3"; + sha256 = "0qfjgkl02ifc0zicv3d5d6zs8mwpq68bg211jy3psgghnqpxyhlm"; }; }; }; @@ -1095,10 +1095,10 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-05c544b339b112226ad14803e1e5b09a61957454"; + name = "psy-psysh-77fc7270031fbc28f9a7bea31385da5c4855cb7a"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/05c544b339b112226ad14803e1e5b09a61957454"; - sha256 = "17d0sdrl0vp267iyxpnwshk4y0d9a1b8l8fj6agfh0plff3gab1c"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/77fc7270031fbc28f9a7bea31385da5c4855cb7a"; + sha256 = "058wlfpslslxh59844ybwk2knplfxd67mc9k4gia3vmakc2n7ysb"; }; }; }; @@ -1245,10 +1245,10 @@ let "squizlabs/php_codesniffer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "squizlabs-php_codesniffer-5e4e71592f69da17871dba6e80dd51bce74a351a"; + name = "squizlabs-php_codesniffer-1359e176e9307e906dc3d890bcc9603ff6d90619"; src = fetchurl { - url = "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a"; - sha256 = "09jajz88dxmpllf0xzlc0gdyqclhsva66ilx6jlsad275m0s9jdp"; + url = "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619"; + sha256 = "0bgb02zirxg0swfil3hacp7ry4cv5rwnbjkrj4l3hqln97cvmn21"; }; }; }; @@ -1265,10 +1265,10 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b"; + name = "symfony-console-4d671ab4ddac94ee439ea73649c69d9d200b5000"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b"; - sha256 = "1q3wf6p8chvhdmfjpjm4q4xl4762p660psn14br419f7km9lwnxq"; + url = "https://api.github.com/repos/symfony/console/zipball/4d671ab4ddac94ee439ea73649c69d9d200b5000"; + sha256 = "13p16qi328f7jds94vh2gswpq2zgkh99zr7x0ihvy9ysmdc4vln2"; }; }; }; @@ -1282,16 +1282,6 @@ let }; }; }; - "symfony/debug" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-debug-6637e62480b60817b9a6984154a533e8e64c6bd5"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/debug/zipball/6637e62480b60817b9a6984154a533e8e64c6bd5"; - sha256 = "0p0llad0zxbswjp06f99jgv1qrf088vpgyf9liy68ng6q83ghim4"; - }; - }; - }; "symfony/deprecation-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -1305,20 +1295,20 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-c1fcde614dfe99d62a83b796a53b8bad358b266a"; + name = "symfony-error-handler-c116cda1f51c678782768dce89a45f13c949455d"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/c1fcde614dfe99d62a83b796a53b8bad358b266a"; - sha256 = "0b4c7n2yy26swjzbsj0n03qjsb5qi6w09v0nl0s70fjrs9fvb0qb"; + url = "https://api.github.com/repos/symfony/error-handler/zipball/c116cda1f51c678782768dce89a45f13c949455d"; + sha256 = "16bvys7dkhja7bjf42k7rxd7d96fbsp1aj3n50a6b6fj3q2jkxwm"; }; }; }; "symfony/event-dispatcher" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-dec8a9f58d20df252b9cd89f1c6c1530f747685d"; + name = "symfony-event-dispatcher-8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/dec8a9f58d20df252b9cd89f1c6c1530f747685d"; - sha256 = "0mf1h2v8xgfn8k55y9yhwr9pb9jia4va5a91xfchyvfyzd5x4sm4"; + url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; + sha256 = "10vdzpy7gvmy0w4lpr4h4xj2gr224k5llc7f356x1jzbijxg8ckh"; }; }; }; @@ -1345,130 +1335,130 @@ let "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-ff2818d1c3d49860bcae1f2cbb5eb00fcd3bf9e2"; + name = "symfony-http-foundation-e7793b7906f72a8cc51054fbca9dcff7a8af1c1e"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/ff2818d1c3d49860bcae1f2cbb5eb00fcd3bf9e2"; - sha256 = "1f9q79rmyxmh7bh55pggi3wkpqza8ya5l5qpynpvxn284rxzfdsh"; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/e7793b7906f72a8cc51054fbca9dcff7a8af1c1e"; + sha256 = "1wd6ja7wfc6gkmbvpvlmg1d2fbnscnqsx5m2c2qzfnr64pm8wnxm"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-cf7e61106abfc19b305ca0aedc41724ced89a02a"; + name = "symfony-http-kernel-255ae3b0a488d78fbb34da23d3e0c059874b5948"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/cf7e61106abfc19b305ca0aedc41724ced89a02a"; - sha256 = "1z1wh7rqf8s9cwpmf540f5q5fbf1ya0iawlvhl60rlqxh9f74ykc"; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/255ae3b0a488d78fbb34da23d3e0c059874b5948"; + sha256 = "0mjkq7badxnrwh8f7xwrpgxsaikb2zb9pf2576v5g3mj4ipf8m2b"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-af49bc163ec3272f677bde3bc44c0d766c1fd662"; + name = "symfony-mime-02265e1e5111c3cd7480387af25e82378b7ab9cc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/af49bc163ec3272f677bde3bc44c0d766c1fd662"; - sha256 = "058is0f9b3v3vgk5p30a75g9pj9v76mrlglpv3p3kbazp1klw22q"; + url = "https://api.github.com/repos/symfony/mime/zipball/02265e1e5111c3cd7480387af25e82378b7ab9cc"; + sha256 = "0fm8smz4y87igkwl7sgp05xzxknbsjb16qma6v6k543ba8p46fzy"; }; }; }; "symfony/polyfill-ctype" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-30885182c981ab175d4d034db0f6f469898070ab"; + name = "symfony-polyfill-ctype-6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab"; - sha256 = "0dfh24f8g048vbj88vx0lvw48nq5dsamy5kva72ab1h7vw9hvpwb"; + url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"; + sha256 = "18235xiqpjx9nzx3pzylm5yzqr6n1j8wnnrzgab1hpbvixfrbqba"; }; }; }; "symfony/polyfill-iconv" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-iconv-f1aed619e28cb077fc83fac8c4c0383578356e40"; + name = "symfony-polyfill-iconv-143f1881e655bebca1312722af8068de235ae5dc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40"; - sha256 = "0fjx1a0kvkj0677nc6h49phqlk0hsgkzbs401lmhj6b6cdc7hvzp"; + url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc"; + sha256 = "19v4r40vx62a181l6zfs7n40w9f7npy7jw5x6dssg40hl4a0i3p2"; }; }; }; "symfony/polyfill-intl-grapheme" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-grapheme-81b86b50cf841a64252b439e738e97f4a34e2783"; + name = "symfony-polyfill-intl-grapheme-433d05519ce6990bf3530fba6957499d327395c2"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783"; - sha256 = "1dxymfi577yridk6dn8v2z1hyrpaxr8sp4g6dxxy913ilf6igx7r"; + url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2"; + sha256 = "11169jh39mhr591b61iara8hvq4pnfzgkynlqg90iv510c74d1cg"; }; }; }; "symfony/polyfill-intl-idn" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-749045c69efb97c70d25d7463abba812e91f3a44"; + name = "symfony-polyfill-intl-idn-59a8d271f00dd0e4c2e518104cc7963f655a1aa8"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44"; - sha256 = "0ni1zlnp5xpxyzbax7v3mn20x35i69nsmch2sx322cs6dwb0ggbn"; + url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8"; + sha256 = "1bcdl48ji0dmswwvw2b66qxdxxawbx8bgicc02la92gacps08n5v"; }; }; }; "symfony/polyfill-intl-normalizer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-8590a5f561694770bdcd3f9b5c69dde6945028e8"; + name = "symfony-polyfill-intl-normalizer-219aa369ceff116e673852dce47c3a41794c14bd"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8"; - sha256 = "1c60xin00q0d2gbyaiglxppn5hqwki616v5chzwyhlhf6aplwsh3"; + url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd"; + sha256 = "1cwckrazq4p4i9ysjh8wjqw8qfnp0rx48pkwysch6z7vkgcif22w"; }; }; }; "symfony/polyfill-mbstring" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-0abb51d2f102e00a4eefcf46ba7fec406d245825"; + name = "symfony-polyfill-mbstring-9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825"; - sha256 = "1z17f7465fn778ak68mzz5kg2ql1n6ghgqh3827n9mcipwbp4k58"; + url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"; + sha256 = "0y289x91c9lgr8vlixj5blayf9lsgi4nn2gyn3a99brvn2jnh6q8"; }; }; }; "symfony/polyfill-php72" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-9a142215a36a3888e30d0a9eeea9766764e96976"; + name = "symfony-polyfill-php72-bf44a9fd41feaac72b074de600314a93e2ae78e2"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976"; - sha256 = "06ipbcvrxjzgvraf2z9fwgy0bzvzjvs5z1j67grg1gb15x3d428b"; + url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2"; + sha256 = "11knb688wcf8yvrprgp4z02z3nb6s5xj3wrv77n2qjkc7nc8q7l7"; }; }; }; "symfony/polyfill-php73" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php73-cc5db0e22b3cb4111010e48785a97f670b350ca5"; + name = "symfony-polyfill-php73-e440d35fa0286f77fb45b79a03fedbeda9307e85"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5"; - sha256 = "04z6fah8rn5b01w78j0vqa0jys4mvji66z4ql6wk1r1bf6j0048y"; + url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85"; + sha256 = "1c7w7j375a1fxq5m4ldy72jg5x4dpijs8q9ryqxvd6gmj1lvncqy"; }; }; }; "symfony/polyfill-php80" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-4407588e0d3f1f52efb65fbe92babe41f37fe50c"; + name = "symfony-polyfill-php80-cfa0ae98841b9e461207c13ab093d76b0fa7bace"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c"; - sha256 = "187whknxl9rs0ddkjph6zmla5kh3k7w6hnvgfc44zig17jxsjdff"; + url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace"; + sha256 = "1kbh4j01kxxc39ls9kzkg7dj13cdlzwy599b96harisysn47jw2n"; }; }; }; "symfony/polyfill-php81" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php81-5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"; + name = "symfony-polyfill-php81-13f6d1271c663dc5ae9fb843a8f16521db7687a1"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"; - sha256 = "0igxnmib8vkjp9x81j66hl4pf8i0nj86k4hdh8gzcymq01si0mxm"; + url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1"; + sha256 = "01dqzkdppaw7kh1vkckkzn54aql4iw6m9vyg99ahhzmqc2krs91x"; }; }; }; @@ -1505,70 +1495,70 @@ let "symfony/service-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-service-contracts-24d9dc654b83e91aa59f9d167b131bc3b5bea24c"; + name = "symfony-service-contracts-4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c"; - sha256 = "1flrnq7dw7rg8b901fbi7gv6k25hqbhffpd15w751fmzsrpzaphl"; + url = "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; + sha256 = "0lh0vxy0h4wsjmnlf42s950bicsvkzz6brqikfnfb5kmvi0xhcm6"; }; }; }; "symfony/string" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-string-3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8"; + name = "symfony-string-4432bc7df82a554b3e413a8570ce2fea90e94097"; src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8"; - sha256 = "1bgcrma3c11i0427cisd4kcp0pgqkia1cc3s1ix12xksi8q6mkjb"; + url = "https://api.github.com/repos/symfony/string/zipball/4432bc7df82a554b3e413a8570ce2fea90e94097"; + sha256 = "08abxmddl3nphkqf6a58r8w1d5la2f3m9rkbhdfv2k78h2nn19v7"; }; }; }; "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-f5c0f6d1f20993b2606f3a5f36b1dc8c1899170b"; + name = "symfony-translation-1639abc1177d26bcd4320e535e664cef067ab0ca"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/f5c0f6d1f20993b2606f3a5f36b1dc8c1899170b"; - sha256 = "0z21vwrapv2p8n4psnc17ka0b2vkrhv6bn4gk0pslj9dl4a0li4j"; + url = "https://api.github.com/repos/symfony/translation/zipball/1639abc1177d26bcd4320e535e664cef067ab0ca"; + sha256 = "0q7f4hfv8n7px5fhh0f8ii6lbfj9xp7fas5ls7yazm4980c06a1x"; }; }; }; "symfony/translation-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-contracts-1211df0afa701e45a04253110e959d4af4ef0f07"; + name = "symfony-translation-contracts-136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07"; - sha256 = "09d057ycwa7l34ph32agkcbam8jwpxh6fr1ay17xf9haczlgs1ad"; + url = "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; + sha256 = "1z1514i3gsxdisyayzh880i8rj954qim7c183cld91kvvqcqi7x0"; }; }; }; "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-cdcadd343d31ad16fc5e006b0de81ea307435053"; + name = "symfony-var-dumper-af52239a330fafd192c773795520dc2dd62b5657"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/cdcadd343d31ad16fc5e006b0de81ea307435053"; - sha256 = "074xgg7z22kxlprahd272gb7krkh9k1rw548s6c3igmk6yylzs9n"; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657"; + sha256 = "1dxmwyg3wxq313zfrjwywkfsi38lq6i3prq69f47vbiqajfs55jn"; }; }; }; "tecnickcom/tc-lib-barcode" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "tecnickcom-tc-lib-barcode-aca01b1be997404aa14e327f70ef51299423b6c6"; + name = "tecnickcom-tc-lib-barcode-4907ef1e384dbb7d3100c897925e7dc071a419a3"; src = fetchurl { - url = "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/aca01b1be997404aa14e327f70ef51299423b6c6"; - sha256 = "1rmanaspjzkpzsp66fxwgmdra042pc7v078ga2v2l88xnniay7xq"; + url = "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/4907ef1e384dbb7d3100c897925e7dc071a419a3"; + sha256 = "1wwrws42lh60zmx7d49dqwlli09j1q6m1669cdlya907icx6cxbd"; }; }; }; "tecnickcom/tc-lib-color" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "tecnickcom-tc-lib-color-ebe0b169122789e4ed6a78d7acd6cf162329c7e4"; + name = "tecnickcom-tc-lib-color-f9e45c59496418227184626ad31e83470153c11f"; src = fetchurl { - url = "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/ebe0b169122789e4ed6a78d7acd6cf162329c7e4"; - sha256 = "1ig97rs6g30557wgpx0z6hssb00pmw1m0ksbizraw9cdkx5wkwrb"; + url = "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/f9e45c59496418227184626ad31e83470153c11f"; + sha256 = "04g9fkk4ifc8sj27jz3nj6rnqgfyls6b2p1ll59wm9d99rngyq72"; }; }; }; @@ -1665,10 +1655,10 @@ let "webmozart/assert" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "webmozart-assert-6964c76c7804814a842473e0c8fd15bab0f18e25"; + name = "webmozart-assert-11cb2199493b2f8a3b53e7f19068fc6aac760991"; src = fetchurl { - url = "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25"; - sha256 = "17xqhb2wkwr7cgbl4xdjf7g1vkal17y79rpp6xjpf1xgl5vypc64"; + url = "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991"; + sha256 = "18qiza1ynwxpi6731jx1w5qsgw98prld1lgvfk54z92b1nc7psix"; }; }; }; From 4cbdad20ee3661cfffab491aa48cf06519da3520 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 9 Aug 2022 15:54:14 -0300 Subject: [PATCH 058/161] iosevka: 15.5.2 -> 15.6.3 Signed-off-by: Otavio Salvador --- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++--------- .../node-packages/node-packages.json | 2 +- .../node-packages/node-packages.nix | 30 ++- 3 files changed, 105 insertions(+), 111 deletions(-) diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 0237d3a3bd00..c8ebfd84db58 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1sd45spjccrqydamgi62ipn8yc378y44s7ikv1zrpfwl29vnnwhr"; - iosevka-aile = "05dsr38f1gvxflna8hk3x61jdf2rl3qrh3bjy4vdffi76fvd1m73"; - iosevka-curly = "1056j12bbljzazdwclj6a6l37h9lpj90kvs08rh6aqxb9hgjkdfy"; - iosevka-curly-slab = "1y8kyz4a7yzdqf619vbgkbmrsyz005nihwkjwljhhnr7w577gm3q"; - iosevka-etoile = "1wxdra9j7cdkxx92yvmkcf3i86iy2rp918aixpgnw50hpyz370qh"; - iosevka-slab = "06xaxh77ghf327p9bc40n45c3bhc0vqgdpk3ym60gfbcxs7jrpxh"; - iosevka-ss01 = "0wlwhl4dm2gg0z4vxkqhp076arkyv9bl8xiwhhif06w440b5nikw"; - iosevka-ss02 = "10kk2n5p85haymfaf3viy4la6hz9kvpvr2a4wd5hs410sc0mkp7g"; - iosevka-ss03 = "16skp5l65jkaz2c02g5slma0qd43v54lavi091z8p7sfl01c7mlk"; - iosevka-ss04 = "0s5m76m9gk4a6b72abpdg4abvp85ymjhrfwmy69il4x02ffx3cih"; - iosevka-ss05 = "1j5nm3rinincz50axxsd8rjrbmj8n8y09sxfj56fxxl9j9qq5vrx"; - iosevka-ss06 = "0g96yj19kd5xx8fvnxjxp19bx8inhl9bsy8r03rlgc2c130xng3z"; - iosevka-ss07 = "05h6knsms00akridmrrrbn2gph9i3gkn15z8snjni99apd1iy6hi"; - iosevka-ss08 = "075m6hdmnsjcq0ybp0h7b5my1w4nbgvczba2a2hxpbh06qqbkyng"; - iosevka-ss09 = "0shw8xwbh3v3sc5agrincx4mz3qpjgbr48alyffzfwrzy4divff7"; - iosevka-ss10 = "08b1517kzfhvpbsbsz38wf5ddbnar55m0z43v4nm8zw76wfhbz9i"; - iosevka-ss11 = "10hvldhxgzr9pyabi6kznh77gl1hkr7fkxmlrvrks4a5h406xq0q"; - iosevka-ss12 = "10lbga8xr9dabvwkdq51xhnniyrlywj54a2ncwchikglyzfzz260"; - iosevka-ss13 = "0h19ggacndxnkl5m7v3cc69mzzfqvyzkaa5al1njmipxfmwlw19c"; - iosevka-ss14 = "04razagrzzpfgacv43nsq6ic7wj22lx0kwfcmlii3cpkyxmyfmhy"; - iosevka-ss15 = "1dm673k51hpi1201yyc18wdb9blvh7ad2qcsn10vxsyi6j34nbdr"; - iosevka-ss16 = "1bhljlji97r2b7lmkczv0v9l5kil70q3isvljgz0m40vbrnknsli"; - iosevka-ss17 = "1nqkg0xx0q418981liv8smv8s1p2nnvrkwdmp2vp57q6gjiw2mf7"; - iosevka-ss18 = "0jmff0f5h20md03as2gprbk74wgg2fwvzd45ap6a4w0cyf7wjpmm"; - sgr-iosevka = "1asrysbc1ah8b7fas49md1b100jw09w13n8bvw9vbipk9zvbbzg5"; - sgr-iosevka-aile = "1dpkakcbl1l5lzrl3bmgci1dyszhp1h38yvm0cfc51pwsy9a81c2"; - sgr-iosevka-curly = "037vmrsqxzls4xdjzzddamxgxan0gx7rhflzwsc4izq5agv77605"; - sgr-iosevka-curly-slab = "1faammvd4dj0nibgfh7xg01wp34ilmzls6azri0d3v9844wmm50a"; - sgr-iosevka-etoile = "0kagsz04z9p5pqg6dvqsx4plrsspnk7pd0kffzxyspfc6h6j3lir"; - sgr-iosevka-fixed = "1wxq1416z8kb22mqvqg2pgrvm9pb2rqalm48gjnyaxz1w15hdxf5"; - sgr-iosevka-fixed-curly = "1i8nbm24hb8m7sj2igvsgil9ab5jwnsjgczypzwkmj559r1jlqzv"; - sgr-iosevka-fixed-curly-slab = "1s1n771dq9w668i22107lmxh7hdjf2lvdcqj2d9lb2mipjawqhfd"; - sgr-iosevka-fixed-slab = "1bldr80k7iwzzrniq7gfgdxnzd9lqwsdwyd19r3ryar8r7d93f9n"; - sgr-iosevka-fixed-ss01 = "0daz5kpmkrjx1s0qvk0gcf0hh2q2sddngglr9v3ci8c026xnn04y"; - sgr-iosevka-fixed-ss02 = "0rak6bnz90rnjb1977apkkabl65090c7iliggbg6g65ljqn3gkfc"; - sgr-iosevka-fixed-ss03 = "1ilk06wvs2p6snzdcrvax7s51p0vyyb8vzzpikmrql1w1q1xdh60"; - sgr-iosevka-fixed-ss04 = "1lmdj7wdxgfqjp348hpmgbc96dmigvdzw3hz1axq64wf18dw4hza"; - sgr-iosevka-fixed-ss05 = "0y7z4v7xyvwzlg792jx8rsqdj7agl2s4z2syhkjrw77dd94mxi4x"; - sgr-iosevka-fixed-ss06 = "1m55n2djfkzwz95xavlvkihcfn4liyiymllhibgh3sgza55gljnc"; - sgr-iosevka-fixed-ss07 = "1dj2bab7rq9rr2n9q4siq8hgdf9pwmwf8hlpn1fkks1998yqshsp"; - sgr-iosevka-fixed-ss08 = "0dmckvn1vd7v86q3rxrb1g6rvz0yfzcfzmyn10maddnrnwf8llfm"; - sgr-iosevka-fixed-ss09 = "15gcw3cvbyvnqj66fp5c5475g9gfz38s98slvqwwhlzlg4g8xfnj"; - sgr-iosevka-fixed-ss10 = "0dbd1yrcfwfr4dx01iwk8rhhh0f40lw5qncc6x5ihqrbsskaspn4"; - sgr-iosevka-fixed-ss11 = "188yga2n0cv9xqdilc06ld1pl0v5k50fb5vr46s2l40p1dkd988i"; - sgr-iosevka-fixed-ss12 = "06h82cd10ia4pdhgdkznli3brkkn8q4fxw3kbylp8c9lxbmrvi40"; - sgr-iosevka-fixed-ss13 = "1xbwdxxpc762y9ghgf6g50mhydd1m7fiqjr62lsqs9811d2db0l4"; - sgr-iosevka-fixed-ss14 = "0am6xg4c5x62s1670lgq7y2qyvc4g9lsffb8xbslvijqlp8k6q3z"; - sgr-iosevka-fixed-ss15 = "0cnikxyl8jps6f2dipq8zry95dh1xqm8wvkdqsxpisnm9cfd7y1k"; - sgr-iosevka-fixed-ss16 = "0dcgj4lcfnzcds8qbdi798qsrdpsi1wqiqpy39080h1908zyzyz2"; - sgr-iosevka-fixed-ss17 = "1iidvrn0ij2wqglndl5a82pw81r4nzd921fsdr4rvklw7a6dlppq"; - sgr-iosevka-fixed-ss18 = "0v73i320wrnlj25grhqz4acw7zbivnjhjj8bcly9ghgv1mzbbaga"; - sgr-iosevka-slab = "0s4kwmic87sll394kynj1hc407mgk43kfakgpgv6x60miqmhp7pz"; - sgr-iosevka-ss01 = "02bjnsjcjgj3418qfbkgbm43mfp3q8fh81ckgjxl6pj0r3cwqahd"; - sgr-iosevka-ss02 = "1pzii9rgim4dz3yjv1hpa4qs2x4s180gkk4p3lkyfwn07kkrbwm6"; - sgr-iosevka-ss03 = "18r4slc9p94w2db4n9d0pqln1v1mn8snfbw3bfpjza3470xfrdwd"; - sgr-iosevka-ss04 = "0laypbvzsxfwpak6c3xhhzzbm1akkzpm9f2nyjgr0pfaix0kdhdi"; - sgr-iosevka-ss05 = "0l9dn96mbv8ssgp6352dm5hykwn5z5457fwkxn6i91jiia693j7r"; - sgr-iosevka-ss06 = "057lgnf1pcir8q76ya8819mg0mwdv7sam810qnrya31dc18dzj6z"; - sgr-iosevka-ss07 = "0w04v61qnl8pwfsm2654w39x0a42c27qs5qc8xpah7j6flpmhk07"; - sgr-iosevka-ss08 = "1nr14v36cq846k9km8sznbvacrnhf4nh62mxvnb3nr17csf85al2"; - sgr-iosevka-ss09 = "1b3pkzv3hdzc2hsj3pzf135g109ln0wzic08kdzsqzsh4yb8q6dp"; - sgr-iosevka-ss10 = "1nmb38l1p1ywccdiysw8mvn5gnm8lwfakvnxk4ya7s4k5p72wpi0"; - sgr-iosevka-ss11 = "0449rzm07rfixsfd9ag3a2s4nl1wwf6q5h0zy9iq507af8ys29ji"; - sgr-iosevka-ss12 = "0n198kxjq81ji3i1q2kg3hyg2p14bllzg7r4kqsz8bvf4ivhdbdl"; - sgr-iosevka-ss13 = "0vm2w0ikhrxr5k6w3521vv6r028gg23iazzr0vg71l0yr05z6z83"; - sgr-iosevka-ss14 = "0nnnzfzr4my9lxvahv8sn6dvj8b5jh0nwc0adq4ca2zpfp7py9qp"; - sgr-iosevka-ss15 = "129v06xq7d0minhrmjm1sz6235khgfp7jc746lkk16dr3fsvajbq"; - sgr-iosevka-ss16 = "0rvda1xpb0c35qhdh3lx84gdymb2hxp8s8zxxl6cmwjhpd2n8mwd"; - sgr-iosevka-ss17 = "0a0y5fh97kqf7nvx1hn5727438y5g75dkqwzba2hy8shx14m9cqq"; - sgr-iosevka-ss18 = "1phcfn83wj0dlh6l514s4nj67k0v919nbd79kg0lyn786lingggq"; - sgr-iosevka-term = "178bp8r875ic65wx34y3193iz4pqp5cls1w534zkqkaw21ppl6gv"; - sgr-iosevka-term-curly = "18fh2z87g1zlf7r5r9gk8cxfvdwrc57r7i1llfadh66xs928imps"; - sgr-iosevka-term-curly-slab = "00sv5ibgwjwgm75lkk56n4ldc0hfk98lc04d45q5gi6rfqzy8bjj"; - sgr-iosevka-term-slab = "1izygr56940q8w5gvgfhqyvamfgsz6g26fpm0lf3hm68ypz6vsx8"; - sgr-iosevka-term-ss01 = "0iad3lzj1w84qrnh8yv9hr7kc7xa84m94r1w8j1yyjjqkf41kqzd"; - sgr-iosevka-term-ss02 = "03lj938i8rilrmdki24xyd38hb83wbazqmkw677q8hbj2pw5j1ax"; - sgr-iosevka-term-ss03 = "1svsffkkp3a3gfw8p1cqm6qc0bmadb5nyyg7jip52qil963bv7yx"; - sgr-iosevka-term-ss04 = "1rndp4r7imysdlxrs0fka63v7dx6i5zsyw03hh0ij034qsnpjdxq"; - sgr-iosevka-term-ss05 = "0013pwg24dzziixz16011zdsda37g65nl1ykd505l5527lgr1ypx"; - sgr-iosevka-term-ss06 = "0ccspibjgbb2d7gp784c70cs4pv8hhzrjvr680v82si4siacshd7"; - sgr-iosevka-term-ss07 = "193px84zyc2f6c7xrzzcpr31xn5h9bhbsygzp35rxma4pgs5qr3x"; - sgr-iosevka-term-ss08 = "1v5gs1lphpbc1pwxg2a4vvwlbckpy9p40gwjsvf99q73mvvs7b4b"; - sgr-iosevka-term-ss09 = "16kd1l9nbqcl1w11l9ppp1xhjhm3rihzm5ndpds0clyjacj2s71f"; - sgr-iosevka-term-ss10 = "1l8jksvg3lq1ygrndh7l2nd2v1f7lsl7wr16g7n44acz94xqyj3i"; - sgr-iosevka-term-ss11 = "005jcj0nk4n7gsl88ygxyncj51lxsh3fr1vdcyjp3d0ipmf9dybb"; - sgr-iosevka-term-ss12 = "08850qi22mb6j48ack9091pgqgfagsyad4jzapn9skhfb04kzc13"; - sgr-iosevka-term-ss13 = "0q85sr0dl93xdia9pdh5lfw11vnnvs9mb0xwrc6zikvakriw8zlb"; - sgr-iosevka-term-ss14 = "0akawjz58qnynagnmf82ldnn6yxjxqyfn5fa9261k91lcrbkcils"; - sgr-iosevka-term-ss15 = "18qmj66589nl68sg047d9hzfh485q6wbib5pa5gllgida92k9vw6"; - sgr-iosevka-term-ss16 = "1baipchlrfj3h8aqcmws5s1s08g843na61p9ql17f86f1lib0gw4"; - sgr-iosevka-term-ss17 = "0zfis06pg6b41gx79qrcl8mniirchfads3vrr1hxi37b9prqqi2y"; - sgr-iosevka-term-ss18 = "0hh4ahrj54fpw3p0fiig6m8y69b2mgxv15qfm9j88fik2aps6b3i"; + iosevka = "001k987gf2drwh57iplicylnk4ssgzrhrfjv3b27xpwanjjdi0j9"; + iosevka-aile = "1yg2g5sq7qc4aw85vaj3f6yc1lrqnx1dfghcb5p5icflp23giv48"; + iosevka-curly = "0haxn2sxmnydrrmmbp0rf4ylzc05z10p73bmhvm53grysawr0lph"; + iosevka-curly-slab = "1z7ji33wf91zayqk6bkjq6ayny5r3sgi1sr94ikn47vb8rax75af"; + iosevka-etoile = "0xcvp5v4fz459fhihij9mm6q95plrz6ffgrr6c9ir4nk0d44gh9p"; + iosevka-slab = "0923yshy81lcssz8p52kjwa0njiyr95kk193n8fnfwycgak5w4g7"; + iosevka-ss01 = "0g90589l5wsa2r7yl7ii04g2lninpw36yrw6djpvh3821d7zfwli"; + iosevka-ss02 = "1pvxnrhcz01ga4yklsc7s8qbcz3il1ibqaszcmkkaxazlqqk600a"; + iosevka-ss03 = "16j0bbyq5yyph07z1vz0lgy1c0ac4hywz394favz00i2gc9gczql"; + iosevka-ss04 = "0000b4d9iwydyyh91v1jkbwszglq8z1wz9a3gaklisga0zfalm32"; + iosevka-ss05 = "0fdcjsfk3ih18cd4ax2vxsxsa3gf6rx7v1ynm3l1ww642zfn7kj6"; + iosevka-ss06 = "0rgnz8d9mlkinkq4bkbgmkvmnnym6amwsbri0pj60dm2dgsp9ipn"; + iosevka-ss07 = "0bfrkh8bc0h2gkyq79vmppjcvil549y2qqaz7vb8gm2gmbglspaz"; + iosevka-ss08 = "17wbg6zzrx6inzx1n7c3gc6h2fa6fch0lnmic8ky4dvzhaqzcpyn"; + iosevka-ss09 = "03fq1mcm0jywjawlkii634vgm2d6173j35ppg1qlgpg5gysjnsvg"; + iosevka-ss10 = "15189r3cg1y1fjcb7qpk03lqfm3f76gzxicwm1kb5220rvjhsqhj"; + iosevka-ss11 = "00yqca40dbnwbz58nyfpqmg6j7azckjwwid1fqabm5dvd5lc2616"; + iosevka-ss12 = "0ikv5rfnvyq5fnppcsfddrz5yjjm6p97hfp7xzx50i4gpykdays7"; + iosevka-ss13 = "0n9nlq4qmgwbxh1qzzhrjf6kb955hk6lkagq7gk1vig49xj2v2w9"; + iosevka-ss14 = "11vva8mdanb5sdx6nv7jr2vqzx7jwapz4hy6dc4xdxvsp90wvqrc"; + iosevka-ss15 = "0v4v6fh4nzd1v15csxj5dc9s7wwxrgx1crb2c1q42xa1fj5s6q11"; + iosevka-ss16 = "0h2vgy0fk8gc2b9nnb8hf79njdkyigsjhnzp0p1mi8k08ca8zy95"; + iosevka-ss17 = "1v1sl9j5ckcvx3p6g4dagxf4cx5n44k6awpg4mz4fhzvfi5y1a3b"; + iosevka-ss18 = "0qjal5mg8bmwa0fd9m59k2m9qjsmfwz0n6f6q6zvb00bi7mw6qhn"; + sgr-iosevka = "1cvf6512iqngy772z78ayzyyd574ymffpldlrdpyvbcgw9kcrh84"; + sgr-iosevka-aile = "166hncxlaq5z32ic88lkgxkj6pbhjz1fdhb5bhzrp1l1mgl29s53"; + sgr-iosevka-curly = "0m37ccridvjik1jhvy0pblbps7m44wkwd1v2s34xv6wr901dmr5x"; + sgr-iosevka-curly-slab = "100cvlpxlv62if341s52w8441axscyijgjz9m1g46yr3lngazff9"; + sgr-iosevka-etoile = "1nwcaqw6rnmp89fhshh74dr45avp59x3fg0h3ipkk17n9slw6b1l"; + sgr-iosevka-fixed = "1m12k9f4a2rn4jx31qw11s4nffw9bgr4v9k12hdnxr7r1ybgg974"; + sgr-iosevka-fixed-curly = "1db12r5amcvxvqn8sqwd120vixnbzk7rb75nibnan1k5zx9vyl2r"; + sgr-iosevka-fixed-curly-slab = "15rly7vg69avxzkiyy2k8jhb29ppjyw7rk49j5zhsyapw6n0f6sy"; + sgr-iosevka-fixed-slab = "0c4sihad0vgy8hhgcbwlwayn3y8krigr6w2f9qlz70adzy8g1z5n"; + sgr-iosevka-fixed-ss01 = "0zw90a22143ixnpb3gx76fgilvbn986lca4bpmd7r318hq48byw3"; + sgr-iosevka-fixed-ss02 = "12hkwg294a11k882s0fr13w2j7cqlri5p0mn5bys926159j71ani"; + sgr-iosevka-fixed-ss03 = "0mz69vxisd12mqx3aw486p96xjhqhgy1nn8p4b17b51zaj7mn593"; + sgr-iosevka-fixed-ss04 = "12rmh62y1s5am7lsw01p14vlchw34spy0rdma7f9yhyjfy0403rs"; + sgr-iosevka-fixed-ss05 = "0mp27hibvz6va2ssapbqk2jhhz1yzr0ax0gprzwrdg89bpnglf34"; + sgr-iosevka-fixed-ss06 = "0z3m9s4366rdk0k4m7vjp5g076jv6kbb7nzf2msdrfz1sxwjl8w3"; + sgr-iosevka-fixed-ss07 = "19b7i5gqzbsf8am81a9yzfn7zbdr5k34vgsp11cj5rrs82li9qrs"; + sgr-iosevka-fixed-ss08 = "0hwr5df93w1ghb2wkszv5npgbdxak0zvdv45nrmpsxhc9hfzy3mx"; + sgr-iosevka-fixed-ss09 = "0i7fahdwlna1nzjsc2iwxj9da0glp8j6ipqxaj3r03chb7p6d5qd"; + sgr-iosevka-fixed-ss10 = "0kq9sfidq14114b3564mp490yi7kwsyk5fx0bc8c06nfn50y565k"; + sgr-iosevka-fixed-ss11 = "19ra48lbasm03ypd9dkfqv816ykn7mvvwcc0x97vlakxqnqb526m"; + sgr-iosevka-fixed-ss12 = "0s4jdj1v5dbfapiqm985w31l7b5ibkz0z2rqzj39rcin42nbbkbi"; + sgr-iosevka-fixed-ss13 = "1437igg9ff9by2bkk1qll1dhssccdi3bzja7s18m5dnjij0g62vp"; + sgr-iosevka-fixed-ss14 = "0n89r0xvcvaxaf67lmsqzxqlxpx9q7ci3zppijvpkhks4p09p70j"; + sgr-iosevka-fixed-ss15 = "1dg7s62kmy024q46hvf29h58gj0mv6hfb9zvkbcxss9vx9xrhw8y"; + sgr-iosevka-fixed-ss16 = "0pfg9m421996cgzvi3y9jxpjl8cxa69mlrddyk98hfq64d9flf3l"; + sgr-iosevka-fixed-ss17 = "17vd2lnxvq2w138p1pkkhs3scl5g96q684ln20gb8hy4330s4fps"; + sgr-iosevka-fixed-ss18 = "00cj148drpnzr9kgb1ginbb294cj1pw35knl866zxl6ds34b4n71"; + sgr-iosevka-slab = "03p0zr75l6q5w1zccv1pk1qmi51rvf680qwvgjgrfzvavqpdzbj9"; + sgr-iosevka-ss01 = "1ncy21zjqsa559pvqbr4alcblc7bpq05i1gfcr2l18aiv8xk4ska"; + sgr-iosevka-ss02 = "1ki1fkwkdzj4f75ysiza2r58x3p4v4i21p7krgphgzz1i9j7z0bc"; + sgr-iosevka-ss03 = "039pf9xlwy9lp03yvc8j2qb0w35kx7h4zncvprbrrpgw0rv688gq"; + sgr-iosevka-ss04 = "1fmqxd4v4lshja2sfbcnb6x038dy3fi3lx6qn93vi9b6rd699xvw"; + sgr-iosevka-ss05 = "0lfk2wijvkv6nzji4fy8zllmgqjszw0aw3g48zl2568348vm8c0z"; + sgr-iosevka-ss06 = "1j9q0v74wkl512z7lgmjqgckprly6zkq1b23ca2cynw5aklsl1c9"; + sgr-iosevka-ss07 = "08v716j55d9m4p349bg4bscn8222fv5prrmlmyjfmj7l2r47sr7m"; + sgr-iosevka-ss08 = "1nnixhi6x26p6l19c54p1hm8pjkdqxjgsxqym82h5dyzsfcraws6"; + sgr-iosevka-ss09 = "1hnb9l1symazn4rz5fjbfpsz3ly0j29vyzkg020i8ibb9h32rg9s"; + sgr-iosevka-ss10 = "109w970ma7fj81bi5nq04nvf6d8ph25i7anaxq6wx507sd5n4bwa"; + sgr-iosevka-ss11 = "04j2y0p2j0zxc2nmmk8m16ham93jm0faymc825zaxj6lmavcygzv"; + sgr-iosevka-ss12 = "1l3rv9p8k0i1zz9gm0gffz3qfzak13ay48b3vx8mmxgd4w6b8q8r"; + sgr-iosevka-ss13 = "19m9hfc236ncp7b7cchm9b315px4cynmhby7pzww9czdjvii8ph3"; + sgr-iosevka-ss14 = "1im0dhlb113kgwq6cba9r14i6m1l60sziddj37bxf4b4qsqcrjkn"; + sgr-iosevka-ss15 = "0jv3gkm9yw7gzrs67m5vnxr7dg99ysnkl09wv1y855r5gx93w0gg"; + sgr-iosevka-ss16 = "1qmwxgw837gqnzf0klq0malfpkg4my3czz50n7rv806x7sn0zsg5"; + sgr-iosevka-ss17 = "161cjfnwm7wcq3vywrn381mps2cd51506b437rpspj8a9xg6dq9w"; + sgr-iosevka-ss18 = "0f4bij7q5mxbwsakqyw879dlwlw6irzk57ryjklqrg2p4zvjll5s"; + sgr-iosevka-term = "1m861kjnk6z7723cjz3gxzfjzqah15r55f6s5plsqipb77pbhh5a"; + sgr-iosevka-term-curly = "07l3zqww2hfw9bipv7ckr59gg38krk925bjxyp51s1fcxn38p3j3"; + sgr-iosevka-term-curly-slab = "1zqyyk33fcz5r73hd5ifg4nbm79jbvzqr2z58jsd8jmamgxbl6fc"; + sgr-iosevka-term-slab = "0cd9ca9iivicwj7vyj3y4vvpix9xn1hl65hb2bvwqh8bqmhxdqg7"; + sgr-iosevka-term-ss01 = "01nx6pckjlhm5lzrfwxzvvgq8hjhqha7y0p3vn1f42qcplsgvcf4"; + sgr-iosevka-term-ss02 = "0qcgx90v0s8472ql99q9165pc27r0xmrkb0fkc0ad0pg2jrdxibh"; + sgr-iosevka-term-ss03 = "1mcw5mbnazx1sma4i4zqsag110zll4m3by59i8gpf7wxlql5lw6j"; + sgr-iosevka-term-ss04 = "17ywb2mgkm7qzjicdkp811q7k36xy6zba33ccp4v9x1i17w13kf7"; + sgr-iosevka-term-ss05 = "0nfnjlyx0avh0vmxxhb8pimy6s1lmzky8vys6hzmivr5q8m3b7g4"; + sgr-iosevka-term-ss06 = "1aq0khld8qpdhgqnasrwrf0kwijjw7b8gkliirpw4jnksyx0kllz"; + sgr-iosevka-term-ss07 = "0vbz95341hmfni82bysrvsw6n30fcbm9j6ac7as824vkxa5lswp8"; + sgr-iosevka-term-ss08 = "0sq4ln16p3g8bbn01a32wi585lbahg4snmfaypbwnxr4gci7jfy3"; + sgr-iosevka-term-ss09 = "1ys24c2gwrizdkrglcns9x5sqgi4z810c8ssqzp6p8n9ldw8q36g"; + sgr-iosevka-term-ss10 = "16v8klsa8xbwlkx60di96c48f7gxnislikrdl7rz222b3pwl6p2j"; + sgr-iosevka-term-ss11 = "1bayyybq3xnrx4sd0pfh18zzwfal5va2j4ykv4vd680pkr7wm3rv"; + sgr-iosevka-term-ss12 = "02280qik2msr9r32pz49sk421fy11vjmay4ic5zfm2rjhvvckvpm"; + sgr-iosevka-term-ss13 = "0h6pi0qbfh35bzpfcgvm14hbvc13ja5pakrwz6nbg4llrghhwg4y"; + sgr-iosevka-term-ss14 = "1yxdbx3y7j21p76mnwwzxknvssw25ymwckcxyjk86c2dq9yjk8id"; + sgr-iosevka-term-ss15 = "1bkcrx9jmq4wbl548hvdqh4ks4s3m446x5990n49s7n0q9qqv4fr"; + sgr-iosevka-term-ss16 = "0p5486bd155whlg9frm8dzrx2p2gs2cz9qjgviva5ldci3w9qhj5"; + sgr-iosevka-term-ss17 = "1wx8gsg8ginqzx91pmddh55nviv070czyyphcl1micwfgwicjs1d"; + sgr-iosevka-term-ss18 = "1wr60w8rnlczdvpq26av27qg8r4abn5jssjrdk7ccl5l84hirrn7"; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 61fbfa7be2ea..15177d950604 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -175,7 +175,7 @@ , "insect" , "intelephense" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v15.5.2.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v15.6.3.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 59afda3b5009..7b5b5406a5b9 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1,6 +1,6 @@ # This file has been generated by node2nix 1.11.1. Do not edit! -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: +{ nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? [ ] }: let sources = { @@ -91168,8 +91168,7 @@ in sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; - meta = { - }; + meta = { }; production = true; bypassCache = true; reconstructLock = true; @@ -95916,8 +95915,7 @@ in }) ]; buildInputs = globalBuildInputs; - meta = { - }; + meta = { }; production = true; bypassCache = true; reconstructLock = true; @@ -106350,14 +106348,14 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v15.5.2.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v15.6.3.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "15.5.2"; + version = "15.6.3"; src = fetchurl { - name = "iosevka-15.5.2.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v15.5.2"; - sha256 = "41d5fea642aeff7555608f0e6286a9cc0ebd59bfaa49e278d3cfcd3caed29603"; + name = "iosevka-15.6.3.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v15.6.3"; + sha256 = "sha256-OJAgZaIAgd0kDQakfyONSp4EBj6xCUM3U4wdN9ZFgcc="; }; dependencies = [ sources."@iarna/toml-2.2.5" @@ -106511,8 +106509,7 @@ in sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; - meta = { - }; + meta = { }; production = true; bypassCache = true; reconstructLock = true; @@ -123218,8 +123215,7 @@ in sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; - meta = { - }; + meta = { }; production = true; bypassCache = true; reconstructLock = true; @@ -123345,8 +123341,7 @@ in sources."xmlbuilder-0.4.2" ]; buildInputs = globalBuildInputs; - meta = { - }; + meta = { }; production = true; bypassCache = true; reconstructLock = true; @@ -134729,8 +134724,7 @@ in sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; - meta = { - }; + meta = { }; production = true; bypassCache = true; reconstructLock = true; From 433dcfc215d8d99cce265441a94c9fa99d60ed43 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 9 Aug 2022 15:54:48 -0300 Subject: [PATCH 059/161] iosevka-bin: 15.6.1 -> 15.6.3 Signed-off-by: Otavio Salvador --- pkgs/data/fonts/iosevka/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index a52446e49964..3a285fe0c55b 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "15.6.1"; + version = "15.6.3"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; From f38a47d64a95881b889a7bbd91f61321ff84a856 Mon Sep 17 00:00:00 2001 From: Francesco Zanini Date: Tue, 9 Aug 2022 22:14:13 +0200 Subject: [PATCH 060/161] =?UTF-8?q?opentrack:=202.1.3=20=E2=86=92=202022.3?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #185520 --- pkgs/applications/misc/opentrack/default.nix | 109 +++++++++++-------- 1 file changed, 65 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix index 009633f32734..34c6b3f712b5 100644 --- a/pkgs/applications/misc/opentrack/default.nix +++ b/pkgs/applications/misc/opentrack/default.nix @@ -1,58 +1,79 @@ -{ mkDerivation, lib, callPackage, fetchzip, fetchFromGitHub, cmake, pkg-config -, ninja, copyDesktopItems, qtbase, qttools, opencv4, procps, eigen, libXdmcp -, libevdev, makeDesktopItem, fetchurl }: +{ + mkDerivation, + lib, + callPackage, + fetchzip, + fetchFromGitHub, + cmake, + pkg-config, + ninja, + copyDesktopItems, + qtbase, + qttools, + opencv4, + procps, + eigen, + libXdmcp, + libevdev, + makeDesktopItem, + fetchurl, +}: let + version = "2022.3.0"; -let - version = "2.3.13"; - - aruco = callPackage ./aruco.nix { }; + aruco = callPackage ./aruco.nix {}; # license.txt inside the zip file is MIT xplaneSdk = fetchzip { url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip"; sha256 = "11wqjsr996c5qhiv2djsd55gc373a9qcq30dvc6rhzm0fys42zba"; }; +in + mkDerivation { + pname = "opentrack"; + inherit version; -in mkDerivation { - pname = "opentrack"; - inherit version; + src = fetchFromGitHub { + owner = "opentrack"; + repo = "opentrack"; + rev = "opentrack-${version}"; + sha256 = "sha256-8gpNORTJclYUYp57Vw/0YO3XC9Idurt0a79fhqx0+mo="; + }; - src = fetchFromGitHub { - owner = "opentrack"; - repo = "opentrack"; - rev = "opentrack-${version}"; - sha256 = "1s986lmm5l1pwbwvd1pfiq84n32s1q1dav7a0cbga4d1vcf0v1ay"; - }; + nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems]; + buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco]; - nativeBuildInputs = [ cmake pkg-config ninja copyDesktopItems ]; - buildInputs = [ qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco ]; + NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3"; + dontWrapQtApps = true; - NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3"; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=RELEASE" + "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a" + "-DSDK_XPLANE=${xplaneSdk}" + ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELEASE" - "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a" - "-DSDK_XPLANE=${xplaneSdk}" - ]; + postInstall = '' + wrapQtApp $out/bin/opentrack + ''; - desktopItems = [ - (makeDesktopItem rec { - name = "opentrack"; - exec = "opentrack"; - icon = fetchurl { - url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png"; - sha256 = "0d114zk78f7nnrk89mz4gqn7yk3k71riikdn29w6sx99h57f6kgn"; - }; - desktopName = name; - genericName = "Head tracking software"; - categories = [ "Utility" ]; - }) - ]; + desktopItems = [ + (makeDesktopItem rec { + name = "opentrack"; + exec = "opentrack"; + icon = fetchurl { + url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png"; + sha256 = "0d114zk78f7nnrk89mz4gqn7yk3k71riikdn29w6sx99h57f6kgn"; + }; + desktopName = name; + genericName = "Head tracking software"; + categories = ["Utility"]; + }) + ]; - meta = with lib; { - homepage = "https://github.com/opentrack/opentrack"; - description = "Head tracking software for MS Windows, Linux, and Apple OSX"; - license = licenses.isc; - maintainers = with maintainers; [ zaninime ]; - }; -} + meta = with lib; { + homepage = "https://github.com/opentrack/opentrack"; + description = "Head tracking software for MS Windows, Linux, and Apple OSX"; + changelog = "https://github.com/opentrack/opentrack/releases/tag/${version}"; + license = licenses.isc; + maintainers = with maintainers; [zaninime]; + }; + } From 8f9ef1c30eb211a7cee99b8621d6cff4980fbd79 Mon Sep 17 00:00:00 2001 From: tirex Date: Wed, 10 Aug 2022 03:09:41 +0200 Subject: [PATCH 061/161] headscale: fix tls challengeType enum possible values --- nixos/modules/services/networking/headscale.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix index f7141de97b5e..ab07e7c14b8c 100644 --- a/nixos/modules/services/networking/headscale.nix +++ b/nixos/modules/services/networking/headscale.nix @@ -286,11 +286,11 @@ in ''; }; challengeType = mkOption { - type = types.enum [ "TLS_ALPN-01" "HTTP-01" ]; + type = types.enum [ "TLS-ALPN-01" "HTTP-01" ]; default = "HTTP-01"; description = lib.mdDoc '' Type of ACME challenge to use, currently supported types: - `HTTP-01` or `TLS_ALPN-01`. + `HTTP-01` or `TLS-ALPN-01`. ''; }; httpListen = mkOption { From 894f16c36e50ab4cc7f0ee52109b72e1f85b46a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Aug 2022 22:38:22 +0000 Subject: [PATCH 062/161] prometheus-pihole-exporter: 0.2.0 -> 0.3.0 --- pkgs/servers/monitoring/prometheus/pihole-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix index 0925cf5dcc63..4fbd45ff587d 100644 --- a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pihole-exporter"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "eko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JxznxE4Pq1fhlt3l1jbGWD5eUg5VF0GmewkuSYECG0Y="; + sha256 = "sha256-LtiJpXucD9Ok1tFFCQ5/V6FhYxbgBWDPF6S49FzWPes="; }; - vendorSha256 = "sha256-jfpM192LtFGVgsVv+F+P8avTGD5c8I+7JFsn4oVoqr0="; + vendorSha256 = "sha256-GCHCWnP3YPC1Dg8Tu0GF5ITDMVRoBv28QVpk6JGN5nQ="; meta = with lib; { description = "Prometheus exporter for PI-Hole's Raspberry PI ad blocker"; From 6f67f8505181672ac2e29af6e8ef8763f63ada54 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 23 Jul 2022 12:43:03 +0200 Subject: [PATCH 063/161] python3Packages.univers: init at 30.7.0 --- .../python-modules/univers/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/univers/default.nix diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix new file mode 100644 index 000000000000..ca3f2b6ce445 --- /dev/null +++ b/pkgs/development/python-modules/univers/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchPypi +, fetchpatch +, buildPythonPackage +, setuptools-scm +, attrs +, packaging +, pyparsing +, semantic-version +, semver +, commoncode +, pytestCheckHook +, saneyaml +}: + +buildPythonPackage rec { + pname = "univers"; + version = "30.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-yM0SDBpkiZEbaZ0ugjiMwwUFKqZGbmh1JNlv5qvPAYo="; + }; + + patches = [ + # Make tests work when not using virtualenv, can be dropped with the next version + # Upstream PR (already merged): https://github.com/nexB/univers/pull/77 + (fetchpatch { + url = "https://github.com/nexB/univers/commit/b74229cc1c8790287633cd7220d6b2e97c508302.patch"; + sha256 = "sha256-i6zWv9rAlwCMghd9g5FP6WIQLLDLYvp+6qJ1E7nfTSY="; + }) + ]; + + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ attrs packaging pyparsing semantic-version semver ]; + checkInputs = [ commoncode pytestCheckHook saneyaml ]; + + dontConfigure = true; # ./configure tries to setup virtualenv and downloads dependencies + + disabledTests = [ "test_codestyle" ]; + + pythonImportsCheck = [ "univers" ]; + + meta = with lib; { + description = "Library for parsing version ranges and expressions"; + homepage = "https://github.com/nexB/univers"; + license = with licenses; [ asl20 bsd3 mit ]; + maintainers = with maintainers; [ armijnhemel sbruder ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e36f7283157..d3b0e846ac6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11011,6 +11011,8 @@ in { unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; + univers = callPackage ../development/python-modules/univers { }; + unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; unrardll = callPackage ../development/python-modules/unrardll { }; From 13760b87d2067dec6afa76859f3e69027bc2e139 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 3 Aug 2022 17:45:14 +0200 Subject: [PATCH 064/161] jitsi-videobridge: fix update script Otherwise e.g. jitsi-videobridge2_2.2-18-gade06bf8 is seen as newer than jitsi-videobridge2_2.2-9-g8cded16e. --- pkgs/servers/jitsi-videobridge/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/jitsi-videobridge/update.sh b/pkgs/servers/jitsi-videobridge/update.sh index bee9c4aa6de2..8646e6573128 100755 --- a/pkgs/servers/jitsi-videobridge/update.sh +++ b/pkgs/servers/jitsi-videobridge/update.sh @@ -6,7 +6,7 @@ set -eu -o pipefail version="$(curl https://download.jitsi.org/stable/ | \ pup 'a[href] text{}' | \ awk -F'[_-]' '/jitsi-videobridge2/ {printf $3"-"$4"-"$5"\n"}' | \ - sort -u | \ + sort -Vu | \ tail -n 1)" update-source-version jitsi-videobridge "$version" From 99ddbdb9fdc521206f7c0063242cf67db2729c6d Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 3 Aug 2022 17:50:23 +0200 Subject: [PATCH 065/161] jitsi-meet-prosody: 1.0.6260 -> 1.0.6447 --- pkgs/misc/jitsi-meet-prosody/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index 66f2cdac3cc1..ceafad682ec8 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.6260"; + version = "1.0.6447"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "ZUfyEYAU4YEYXBoM+tEZ6SAhqlNcsmxnKw8WEv0gy7M="; + sha256 = "wmZV0jynaaZPLazdYhaKl9l5zPjgn12omoMfwEMqxSA="; }; dontBuild = true; From 73afec56918c41e848ab91ec670d6bb60dec7c6f Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 3 Aug 2022 17:50:38 +0200 Subject: [PATCH 066/161] jicofo: 1.0-900 -> 1.0-911 --- pkgs/servers/jicofo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index 916e72c90a38..2b30b6f63a0e 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-900"; + version = "1.0-911"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "tAuWhu1DdasOuLIz9/Ox1n1XcFWm5qnTVr6FpdKpwbE="; + sha256 = "YB66NYmonbVgKpzv2pyQv7r0hYKDeBAngxrE4yWPp0o="; }; in stdenv.mkDerivation { From ae318632bc9e6c8c6faf7bc72a9df338bd31ba94 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 3 Aug 2022 17:50:52 +0200 Subject: [PATCH 067/161] jitsi-videobridge: 2.2-9-g8cded16e -> 2.2-22-g42bc1b99 --- pkgs/servers/jitsi-videobridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 39629639ad81..53db8b7303a8 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.2-9-g8cded16e"; + version = "2.2-22-g42bc1b99"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "L9h+qYV/W2wPzycfDGC4AXpTl7wlulyt2KryA+Tb/YU="; + sha256 = "ZiIeD5NXHMurcoyVnD8RCGuOKRiUDU1AMH57A0s4tAs="; }; in stdenv.mkDerivation { From a33c768df94209409a01fde588b5bfd31c850281 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 3 Aug 2022 17:51:12 +0200 Subject: [PATCH 068/161] jitsi-meet: 1.0.6260 -> 1.0.6447 --- pkgs/servers/web-apps/jitsi-meet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index 579ffb1a6777..962fb979cfc4 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.6260"; + version = "1.0.6447"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "Y1ELKdFdbnq20yUt4XoXmstJm8uI8EBGIFOvFWf+5Uw="; + sha256 = "5JEPKifti7qKx0lGk4qPJJlCX4QxMhBGJqTFYktoie8="; }; dontBuild = true; From 9a260b5b9f9b8e89ff810ee7d1805ee08bec295b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 19:47:58 +0000 Subject: [PATCH 069/161] pgloader: 3.6.6 -> 3.6.7 --- pkgs/development/tools/pgloader/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index 94bdb69c1568..339009a50eb3 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, sbcl_2_2_6, sqlite, freetds, libzip, curl, git, cacert, openssl }: stdenv.mkDerivation rec { pname = "pgloader"; - version = "3.6.6"; + version = "3.6.7"; src = fetchurl { - url = "https://github.com/dimitri/pgloader/releases/download/v3.6.6/pgloader-bundle-3.6.6.tgz"; - sha256 = "sha256-GDdWXY/O2xMsaIhaQIk+w8WQt9qevO8cDlgLGfNTVE0="; + url = "https://github.com/dimitri/pgloader/releases/download/v3.6.7/pgloader-bundle-3.6.7.tgz"; + sha256 = "sha256-JfF2el0vJjDAyB2l3H4dLgEIgnmXlrCUVYKDpj2jM1Y="; }; nativeBuildInputs = [ git makeWrapper ]; From ebf9a4ad8961ac1ef65b762bf374b42044b174aa Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 13 Aug 2022 23:49:37 +0300 Subject: [PATCH 070/161] =?UTF-8?q?miniflux:=202.0.37=20=E2=86=92=202.0.38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/miniflux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 4747db0b79c2..031e3b5a22ab 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.37"; + version = "2.0.38"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-cmzPm/kvl+eIQOhGFAqW7dyLcEi836ohJ7sbMNkdXCA="; + sha256 = "sha256-y6g5HGIgEgb+Z26aKgj90oHIrXmrTmrpQyflKPOS0No="; }; - vendorSha256 = "sha256-3VlyTYHE1ll2LwNTPKmpdNr1PKxzjhB2TWgr5Gl1RGE="; + vendorSha256 = "sha256-ED4Rq+ks+75PdJvIye17eI7MLEJdP9yXHhbonqw2oMI="; nativeBuildInputs = [ installShellFiles ]; From b146c4fcfb66c6ee97aefc97ce3c9182e2d79d77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 23:43:18 +0000 Subject: [PATCH 071/161] hyfetch: 1.3.0 -> 1.4.0 --- pkgs/tools/misc/hyfetch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix index 80582524eee2..59ecf3ff54c6 100644 --- a/pkgs/tools/misc/hyfetch/default.nix +++ b/pkgs/tools/misc/hyfetch/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "HyFetch"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { repo = "hyfetch"; owner = "hykilpikonna"; - rev = version; - sha256 = "sha256-8Mp3MV9HVzXzT/W6F/lD34tT0uOgqyydg31PlR3sMUA="; + rev = "refs/tags/${version}"; + sha256 = "sha256-15FeW3yaM7eUJ1O20H/bQquDRAsRWTJMzkzQ5Kv1ezE="; }; # TODO: Remove with next release bump since it has been fixed upstream (hykilpikonna/hyfetch@d797a8c) From 1c395dbabe0bef15698c10959b82752f29facbdf Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 4 Aug 2022 17:16:30 -0400 Subject: [PATCH 072/161] =?UTF-8?q?zynaddsubfx:=203.0.5=20=E2=86=92=203.0.?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../audio/zynaddsubfx/default.nix | 35 ++++-- .../audio/zynaddsubfx/mruby-zest/default.nix | 106 +++++----------- ...linker.patch => force-cxx-as-linker.patch} | 8 +- .../zynaddsubfx/mruby-zest/system-libuv.patch | 113 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 13 +- 6 files changed, 66 insertions(+), 210 deletions(-) rename pkgs/applications/audio/zynaddsubfx/mruby-zest/{force-gcc-as-linker.patch => force-cxx-as-linker.patch} (55%) delete mode 100644 pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 101d4dc93797..fae337c079f0 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -15,7 +15,7 @@ , zlib # Optional dependencies -, alsaSupport ? true +, alsaSupport ? stdenv.isLinux , alsa-lib , dssiSupport ? false , dssi @@ -27,11 +27,13 @@ , ossSupport ? true , portaudioSupport ? true , portaudio +, sndioSupport ? stdenv.isOpenBSD +, sndio # Optional GUI dependencies , guiModule ? "off" , cairo -, fltk13 +, fltk , libGL , libjpeg , libX11 @@ -40,6 +42,7 @@ # Test dependencies , cxxtest +, ruby }: assert builtins.any (g: guiModule == g) [ "fltk" "ntk" "zest" "off" ]; @@ -50,22 +53,24 @@ let "ntk" = "NTK"; "zest" = "Zyn-Fusion"; }.${guiModule}; + mruby-zest = callPackage ./mruby-zest { }; in stdenv.mkDerivation rec { pname = "zynaddsubfx"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "1vh1gszgjxwn8m32rk5222z1j2cnjax0bqpag7b47v6i36p2q4x8"; + rev = "refs/tags/${version}"; fetchSubmodules = true; + sha256 = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg="; }; outputs = [ "out" "doc" ]; postPatch = '' + patchShebangs rtosc/test/test-port-checker.rb src/Tests/check-ports.rb substituteInPlace src/Misc/Config.cpp --replace /usr $out ''; @@ -77,7 +82,8 @@ in stdenv.mkDerivation rec { ++ lib.optionals jackSupport [ libjack2 ] ++ lib.optionals lashSupport [ lash ] ++ lib.optionals portaudioSupport [ portaudio ] - ++ lib.optionals (guiModule == "fltk") [ fltk13 libjpeg libXpm ] + ++ lib.optionals sndioSupport [ sndio ] + ++ lib.optionals (guiModule == "fltk") [ fltk libjpeg libXpm ] ++ lib.optionals (guiModule == "ntk") [ ntk cairo libXpm ] ++ lib.optionals (guiModule == "zest") [ libGL libX11 ]; @@ -89,7 +95,7 @@ in stdenv.mkDerivation rec { ++ lib.optional (guiModule == "fltk") "-DFLTK_SKIP_OPENGL=ON"; doCheck = true; - checkInputs = [ cxxtest ]; + checkInputs = [ cxxtest ruby ]; # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 checkPhase = let @@ -107,7 +113,9 @@ in stdenv.mkDerivation rec { ''; # Use Zyn-Fusion logo for zest build - # Manually derived from https://github.com/mruby-zest/mruby-zest-build/blob/3.0.6/src/mruby-zest/example/ZynLogo.qml#L65-L97 + # An SVG version of the logo isn't hosted anywhere we can fetch, I + # had to manually derive it from the code that draws it in-app: + # https://github.com/mruby-zest/mruby-zest-build/blob/3.0.6/src/mruby-zest/example/ZynLogo.qml#L65-L97 postInstall = lib.optionalString (guiModule == "zest") '' rm -r "$out/share/pixmaps" mkdir -p "$out/share/icons/hicolor/scalable/apps" @@ -133,8 +141,15 @@ in stdenv.mkDerivation rec { then "https://zynaddsubfx.sourceforge.io/zyn-fusion.html" else "https://zynaddsubfx.sourceforge.io"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ goibhniu kira-bruneau ]; - platforms = platforms.linux; + platforms = platforms.all; + + # On macOS: + # - Tests don't compile (ld: unknown option: --no-as-needed) + # - ZynAddSubFX LV2 & VST plugin fail to compile (not setup to use ObjC version of pugl) + # - TTL generation crashes (`pointer being freed was not allocated`) for all VST plugins using AbstractFX + # - Zest UI fails to start on pulg_setup: Could not open display, aborting. + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix index 1c9cb0a463dc..797b4624b966 100644 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix @@ -1,9 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , bison -, git -, python2 +, pkg-config , rake , ruby , libGL @@ -11,87 +10,42 @@ , libX11 }: -let - mgem-list = fetchFromGitHub { - owner = "mruby"; - repo = "mgem-list"; - rev = "2033837203c8a141b1f9d23bb781fe0cbaefbd24"; - sha256 = "0igf2nsx5i6g0yf7sjxxkngyriv213d0sjs3yidrflrabiywpxmm"; - }; - - mruby-dir = fetchFromGitHub { - owner = "iij"; - repo = "mruby-dir"; - rev = "89dceefa1250fb1ae868d4cb52498e9e24293cd1"; - sha256 = "0zrhiy9wmwmc9ls62iyb2z86j2ijqfn7rn4xfmrbrfxygczarsm9"; - }; - - mruby-errno = fetchFromGitHub { - owner = "iij"; - repo = "mruby-errno"; - rev = "b4415207ff6ea62360619c89a1cff83259dc4db0"; - sha256 = "12djcwjjw0fygai5kssxbfs3pzh3cpnq07h9m2h5b51jziw380xj"; - }; - - mruby-file-stat = fetchFromGitHub { - owner = "ksss"; - repo = "mruby-file-stat"; - rev = "aa474589f065c71d9e39ab8ba976f3bea6f9aac2"; - sha256 = "1clarmr67z133ivkbwla1a42wcjgj638j9w0mlv5n21mhim9rid5"; - }; - - mruby-process = fetchFromGitHub { - owner = "iij"; - repo = "mruby-process"; - rev = "fe171fbe2a6cc3c2cf7d713641bddde71024f7c8"; - sha256 = "00yrzc371f90gl5m1gbkw0qq8c394bpifssjr8p1wh5fmzhxqyml"; - }; - - mruby-pack = fetchFromGitHub { - owner = "iij"; - repo = "mruby-pack"; - rev = "383a9c79e191d524a9a2b4107cc5043ecbf6190b"; - sha256 = "003glxgxifk4ixl12sy4gn9bhwvgb79b4wga549ic79isgv81w2d"; - }; -in stdenv.mkDerivation rec { pname = "mruby-zest"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = pname; repo = "${pname}-build"; - rev = version; - sha256 = "0fxljrgamgz2rm85mclixs00b0f2yf109jc369039n1vf0l5m57d"; + rev = "refs/tags/${version}"; fetchSubmodules = true; + sha256 = "sha256-rIb6tQimwrUj+623IU5zDyKNWsNYYBElLQClOsP+5Dc="; }; - nativeBuildInputs = [ bison git python2 rake ruby ]; - buildInputs = [ libGL libuv libX11 ]; - patches = [ - ./force-gcc-as-linker.patch - ./system-libuv.patch - - # Pull upstream fix for -fno-common toolchains: - # https://github.com/mruby-zest/mruby-zest-build/issues/25 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/mruby-zest/mruby-zest-build/commit/4eb88250f22ee684acac95d4d1f114df504e37a7.patch"; - sha256 = "0wg7qy1vg0mzcxagf35bv35dlr0q17pxjicigpf86yqppvgrzrsb"; - }) + ./force-cxx-as-linker.patch ]; - # Add missing dependencies of deps/mruby-dir-glob/mrbgem.rake - # Should be fixed in next release, see bcadb0a5490bd6d599f1a0e66ce09b46363c9dae - postPatch = '' - mkdir -p mruby/build/mrbgems - ln -s ${mgem-list} mruby/build/mrbgems/mgem-list - ln -s ${mruby-dir} mruby/build/mrbgems/mruby-dir - ln -s ${mruby-errno} mruby/build/mrbgems/mruby-errno - ln -s ${mruby-file-stat} mruby/build/mrbgems/mruby-file-stat - ln -s ${mruby-process} mruby/build/mrbgems/mruby-process - ln -s ${mruby-pack} mruby/build/mrbgems/mruby-pack + nativeBuildInputs = [ + bison + pkg-config + rake + ruby + ]; + + buildInputs = [ + libGL + libuv + libX11 + ]; + + # Force optimization to fix: + # warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) + NIX_CFLAGS_COMPILE = "-O3"; + + # Remove pre-built y.tab.c to generate with nixpkgs bison + preBuild = '' + rm mruby/mrbgems/mruby-compiler/core/y.tab.c ''; installTargets = [ "pack" ]; @@ -102,8 +56,8 @@ stdenv.mkDerivation rec { # mruby-widget-lib/src/api.c requires MainWindow.qml as part of a # sanity check, even though qml files are compiled into the binary - # https://github.com/mruby-zest/mruby-zest-build/tree/3.0.5/src/mruby-widget-lib/src/api.c#L99-L116 - # https://github.com/mruby-zest/mruby-zest-build/tree/3.0.5/linux-pack.sh#L17-L18 + # https://github.com/mruby-zest/mruby-zest-build/blob/3.0.6/src/mruby-widget-lib/src/api.c#L107-L124 + # https://github.com/mruby-zest/mruby-zest-build/blob/3.0.6/linux-pack.sh#L17-L18 mkdir -p "$out/qml" touch "$out/qml/MainWindow.qml" ''; @@ -111,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Zest Framework used in ZynAddSubFX's UI"; homepage = "https://github.com/mruby-zest"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch b/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-cxx-as-linker.patch similarity index 55% rename from pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch rename to pkgs/applications/audio/zynaddsubfx/mruby-zest/force-cxx-as-linker.patch index c521d2407740..bd5cd1edd8ee 100644 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-cxx-as-linker.patch @@ -1,13 +1,13 @@ diff --git a/mruby/tasks/toolchains/gcc.rake b/mruby/tasks/toolchains/gcc.rake -index f370c0ab..e5ab9f60 100644 +index 51bda6517..9bc96d0e2 100644 --- a/mruby/tasks/toolchains/gcc.rake +++ b/mruby/tasks/toolchains/gcc.rake -@@ -22,7 +22,7 @@ MRuby::Toolchain.new(:gcc) do |conf, _params| +@@ -23,7 +23,7 @@ MRuby::Toolchain.new(:gcc) do |conf, params| end conf.linker do |linker| -- linker.command = ENV['LD'] || 'gcc' -+ linker.command = 'gcc' +- linker.command = ENV['LD'] || ENV['CXX'] || ENV['CC'] || default_command ++ linker.command = ENV['CXX'] || ENV['CC'] || default_command linker.flags = [ENV['LDFLAGS'] || %w()] linker.libraries = %w(m) linker.library_paths = [] diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch b/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch deleted file mode 100644 index b7050abc1235..000000000000 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/Makefile b/Makefile -index f3e3be2..2398852 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,3 @@ --UV_DIR = libuv-v1.9.1 --UV_FILE = $(UV_DIR).tar.gz --UV_URL = http://dist.libuv.org/dist/v1.9.1/$(UV_FILE) -- -- - all: - ruby ./rebuild-fcache.rb - cd deps/nanovg/src && $(CC) nanovg.c -c -fPIC -@@ -10,12 +5,12 @@ all: - # cd deps/pugl && python2 ./waf configure --no-cairo --static - cd deps/pugl && python2 ./waf configure --no-cairo --static --debug - cd deps/pugl && python2 ./waf -- cd src/osc-bridge && CFLAGS="-I ../../deps/$(UV_DIR)/include " make lib -+ cd src/osc-bridge && make lib - cd mruby && MRUBY_CONFIG=../build_config.rb rake - $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ - ./deps/libnanovg.a \ - src/osc-bridge/libosc-bridge.a \ -- ./deps/$(UV_DIR)/.libs/libuv.a -lm -lX11 -lGL -lpthread -+ -luv -lm -lX11 -lGL -lpthread - $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 - - osx: -@@ -25,12 +20,12 @@ osx: - cd deps/pugl && python2 ./waf configure --no-cairo --static - # cd deps/pugl && python2 ./waf configure --no-cairo --static --debug - cd deps/pugl && python2 ./waf -- cd src/osc-bridge && CFLAGS="-I ../../deps/$(UV_DIR)/include " make lib -+ cd src/osc-bridge && make lib - cd mruby && MRUBY_CONFIG=../build_config.rb rake - $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ - ./deps/libnanovg.a \ - src/osc-bridge/libosc-bridge.a \ -- ./deps/$(UV_DIR)/.libs/libuv.a -lm -framework OpenGL -lpthread -+ -luv -lm -framework OpenGL -lpthread - $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -framework OpenGL -framework AppKit -lpthread -I deps/pugl -std=gnu99 - - windows: -@@ -38,38 +33,14 @@ windows: - $(AR) rc deps/libnanovg.a deps/nanovg/src/*.o - cd deps/pugl && CFLAGS="-mstackrealign" python2 ./waf configure --no-cairo --static --target=win32 - cd deps/pugl && python2 ./waf -- cd src/osc-bridge && CFLAGS="-mstackrealign -I ../../deps/$(UV_DIR)/include " make lib -+ cd src/osc-bridge && CFLAGS="-mstackrealign" make lib - cd mruby && WINDOWS=1 MRUBY_CONFIG=../build_config.rb rake - $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f | grep -e "\.o$$" | grep -v bin` \ - ./deps/libnanovg.a \ - src/osc-bridge/libosc-bridge.a \ -- ./deps/libuv-win.a \ -- -lm -lpthread -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 -+ -luv -lm -lpthread -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 - $(CC) -mstackrealign -DWIN32 test-libversion.c deps/pugl/build/libpugl-0.a -o zest.exe -lpthread -I deps/pugl -std=c99 -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 - -- --builddep: deps/libuv.a --deps/libuv.a: -- cd deps/$(UV_DIR) && ./autogen.sh -- cd deps/$(UV_DIR) && CFLAGS=-fPIC ./configure -- cd deps/$(UV_DIR) && CFLAGS=-fPIC make -- cp deps/$(UV_DIR)/.libs/libuv.a deps/ -- --builddepwin: deps/libuv-win.a --deps/libuv-win.a: -- cd deps/$(UV_DIR) && ./autogen.sh -- cd deps/$(UV_DIR) && CFLAGS="-mstackrealign" ./configure --host=x86_64-w64-mingw32 -- cd deps/$(UV_DIR) && LD=x86_64-w64-mingw32-gcc make -- cp deps/$(UV_DIR)/.libs/libuv.a deps/libuv-win.a -- --deps/$(UV_DIR): -- cd deps && wget -4 $(UV_URL) && tar xvf $(UV_FILE) --setup: deps/$(UV_DIR) -- --setupwin: -- cd deps && wget -4 $(UV_URL) -- cd deps && tar xvf $(UV_FILE) -- - push: - cd src/osc-bridge && git push - cd src/mruby-qml-parse && git push -diff --git a/build_config.rb b/build_config.rb -index 00f1f69..11ac15b 100644 ---- a/build_config.rb -+++ b/build_config.rb -@@ -96,7 +96,6 @@ build_type.new(build_name) do |conf| - conf.cc do |cc| - cc.include_paths << "#{`pwd`.strip}/../deps/nanovg/src" - cc.include_paths << "#{`pwd`.strip}/../deps/pugl/" -- cc.include_paths << "#{`pwd`.strip}/../deps/libuv-v1.9.1/include/" - cc.include_paths << "/usr/share/mingw-w64/include/" if windows - cc.include_paths << "/usr/x86_64-w64-mingw32/include/" if windows - cc.flags << "-DLDBL_EPSILON=1e-6" if windows -@@ -117,14 +116,14 @@ build_type.new(build_name) do |conf| - linker.flags_after_libraries << "#{`pwd`.strip}/../deps/pugl/build/libpugl-0.a" - linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libnanovg.a" - if(!windows) -- linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv.a" -+ linker.flags_after_libraries << "-luv" - if(ENV['OS'] != "Mac") - linker.libraries << 'GL' - linker.libraries << 'X11' - end - linker.flags_after_libraries << "-lpthread -ldl -lm" - else -- linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv-win.a" -+ linker.flags_after_libraries << "-luv" - linker.flags_after_libraries << "-lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi" - linker.flags_after_libraries << "-lglu32 -lgdi32 -lopengl32" - end diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e022ec9dc024..2205d3dc652f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1640,6 +1640,7 @@ mapAliases ({ torchat = throw "torchat was removed because it was broken and requires Python 2"; # added 2022-06-05 ttyrec = ovh-ttyrec; # Added 2021-01-02 zplugin = zinit; # Added 2021-01-30 + zyn-fusion = zynaddsubfx; # Added 2022-08-05 inherit (stdenv.hostPlatform) system; # Added 2021-10-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16995579c690..2d40441dc83f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31821,20 +31821,19 @@ with pkgs; inherit (nodePackages) zx; - zynaddsubfx = zyn-fusion; + zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { + guiModule = "zest"; + fftw = fftwSinglePrec; + }; - zynaddsubfx-fltk = callPackage ../applications/audio/zynaddsubfx { + zynaddsubfx-fltk = zynaddsubfx.override { guiModule = "fltk"; }; - zynaddsubfx-ntk = callPackage ../applications/audio/zynaddsubfx { + zynaddsubfx-ntk = zynaddsubfx.override { guiModule = "ntk"; }; - zyn-fusion = callPackage ../applications/audio/zynaddsubfx { - guiModule = "zest"; - }; - ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS aeon = callPackage ../applications/blockchains/aeon { From c36152b37999fe34af1379f533b3fef227527061 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 12 Aug 2022 14:12:43 -0700 Subject: [PATCH 073/161] python310Packages.django-maintenance-mode: Fix missing python-fsutil dependency The latest version is broken because it newly depends on python-fsutil, which was not specified as a buildInput. --- .../django-maintenance-mode/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix index fb16843b4034..76ae8338eeb2 100644 --- a/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytest, django }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytest +, django +, python-fsutil +}: buildPythonPackage rec { pname = "django-maintenance-mode"; @@ -8,12 +14,12 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-G08xQpLQxnt7JbtIo06z0NlRAMbca3UWbo4aXQR/Wy0="; + hash = "sha256-G08xQpLQxnt7JbtIo06z0NlRAMbca3UWbo4aXQR/Wy0="; }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ django python-fsutil ]; meta = with lib; { description = "Shows a 503 error page when maintenance-mode is on"; From e4f2c0b0c2c92b3589691f6a9d6d452d0badbbfa Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 14 Aug 2022 10:14:51 +0800 Subject: [PATCH 074/161] hyfetch: remove unneeded postPatch --- pkgs/tools/misc/hyfetch/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix index 59ecf3ff54c6..ec64cc56d1eb 100644 --- a/pkgs/tools/misc/hyfetch/default.nix +++ b/pkgs/tools/misc/hyfetch/default.nix @@ -11,11 +11,6 @@ buildPythonPackage rec { sha256 = "sha256-15FeW3yaM7eUJ1O20H/bQquDRAsRWTJMzkzQ5Kv1ezE="; }; - # TODO: Remove with next release bump since it has been fixed upstream (hykilpikonna/hyfetch@d797a8c) - postPatch = '' - chmod +x neofetch - ''; - propagatedBuildInputs = [ typing-extensions setuptools From f28b29999b4351b2ed9dc5f06cd50879bd698da5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 02:45:20 +0000 Subject: [PATCH 075/161] fishPlugins.fzf-fish: 9.0 -> 9.2 --- pkgs/shells/fish/plugins/fzf-fish.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index a4a4e319c6bb..5f55808cb514 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "fzf.fish"; - version = "9.0"; + version = "9.2"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - sha256 = "sha256-0rnd8oJzLw8x/U7OLqoOMQpK81gRc7DTxZRSHxN9YlM="; + sha256 = "sha256-XmRGe39O3xXmTvfawwT2mCwLIyXOlQm7f40mH5tzz+s="; }; checkInputs = [ fzf fd util-linux ]; From 83519fe97684e52bac2a82c2457ed934bff2dfb0 Mon Sep 17 00:00:00 2001 From: Winter Date: Sat, 13 Aug 2022 23:09:06 -0400 Subject: [PATCH 076/161] iosevka: fix build --- pkgs/data/fonts/iosevka/default.nix | 24 +- pkgs/data/fonts/iosevka/node-composition.nix | 17 + pkgs/data/fonts/iosevka/node-packages.nix | 2697 ++++++++++++++++++ 3 files changed, 2728 insertions(+), 10 deletions(-) create mode 100644 pkgs/data/fonts/iosevka/node-composition.nix create mode 100644 pkgs/data/fonts/iosevka/node-packages.nix diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index b4f64c59d80b..53e5b4a3db76 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, nodejs, nodePackages, remarshal +{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, remarshal , ttfautohint-nox # Custom font set options. # See https://typeof.net/Iosevka/customizer @@ -55,13 +55,18 @@ let # # Doing it this way ensures that the package can always be built, # although possibly an older version than ioseva-bin. - nodeIosevka = ( - lib.findSingle - (drv: drv ? packageName && drv.packageName == "iosevka") - (throw "no 'iosevka' package found in nodePackages") - (throw "multiple 'iosevka' packages found in nodePackages") - (lib.attrValues nodePackages) - ).override (drv: { dontNpmInstall = true; }); + 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="; + }; + }; + in stdenv.mkDerivation rec { pname = if set != null then "iosevka-${set}" else "iosevka"; @@ -69,7 +74,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nodejs - nodeIosevka remarshal ttfautohint-nox ]; @@ -108,7 +112,7 @@ stdenv.mkDerivation rec { buildPhase = '' export HOME=$TMPDIR runHook preBuild - npm run build --no-update-notifier -- --jCmd=$NIX_BUILD_CORES ttf::$pname >/dev/null + npm run build --no-update-notifier -- --jCmd=$NIX_BUILD_CORES --verbose=9 ttf::$pname runHook postBuild ''; diff --git a/pkgs/data/fonts/iosevka/node-composition.nix b/pkgs/data/fonts/iosevka/node-composition.nix new file mode 100644 index 000000000000..2e810490ca8d --- /dev/null +++ b/pkgs/data/fonts/iosevka/node-composition.nix @@ -0,0 +1,17 @@ +# 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 new file mode 100644 index 000000000000..cff861ddfbf6 --- /dev/null +++ b/pkgs/data/fonts/iosevka/node-packages.nix @@ -0,0 +1,2697 @@ +# 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;"; + }; + }); +} From 97f7cf06d25037b49c18ef4d558d7c191f25d9d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 03:54:19 +0000 Subject: [PATCH 077/161] git-cinnabar: 0.5.7 -> 0.5.10 --- .../version-management/git-and-tools/git-cinnabar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix index 91c1b38de559..df6a084bbd75 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { pname = "git-cinnabar"; - version = "0.5.7"; + version = "0.5.10"; src = fetchFromGitHub { owner = "glandium"; repo = "git-cinnabar"; rev = version; - sha256 = "04dsjlsw98avrckldx7rc70b2zsbajzkyqqph4c7d9xd5djh3yaj"; + sha256 = "sha256-vHHugCZ7ikB4lIv/TcNuOMSQsm0zCkGqu2hAFrqygu0="; fetchSubmodules = true; }; From 0dc9748c6fecc7abc0f26bda888c3f0019bae0d8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 14 Aug 2022 04:20:00 +0000 Subject: [PATCH 078/161] starship: 1.9.1 -> 1.10.0 https://github.com/starship/starship/releases/tag/v1.10.0 --- pkgs/tools/misc/starship/default.nix | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 4f3603d6e6f0..7875f01f1f07 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -5,6 +5,8 @@ , installShellFiles , libiconv , libgit2 +, cmake +, fetchpatch , pkg-config , nixosTests , Security @@ -14,16 +16,17 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IujaGyAGYlBb4efaRb13rsPSD2gWAg5UgG10iMp9iQE="; + sha256 = "sha256-mumlnY9KGKdS3x4U84J4I8m5uMJI7SZR52aT6DPi/MM="; }; - nativeBuildInputs = [ installShellFiles pkg-config ]; + nativeBuildInputs = [ installShellFiles cmake ] + ++ lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ]; @@ -32,13 +35,21 @@ rustPlatform.buildRustPackage rec { buildFeatures = if stdenv.isDarwin then [ "battery" ] else [ "default" ]; postInstall = '' - for shell in bash fish zsh; do - STARSHIP_CACHE=$TMPDIR $out/bin/starship completions $shell > starship.$shell - installShellCompletion starship.$shell - done + installShellCompletion --cmd starship \ + --bash <($out/bin/starship completions bash) \ + --fish <($out/bin/starship completions fish) \ + --zsh <($out/bin/starship completions zsh) ''; - cargoSha256 = "sha256-HrSMNNrldwb6LMMuxdQ84iY+/o5L2qwe+Vz3ekQt1YQ="; + cargoPatches = [ + # Bump chrono dependency to fix panic when no timezone + (fetchpatch { + url = "https://github.com/starship/starship/commit/e652e8643310c3b41ce19ad05b8168abc29bb683.patch"; + sha256 = "sha256-iGYLJuptPMc45E7o+GXjIx7y2PxuO1mGM7xSopDBve0="; + }) + ]; + + cargoSha256 = "sha256-w7UCExSkgEY52D98SSe2EkuiwtjM6t0/uTiafrtEBaU="; preCheck = '' HOME=$TMPDIR From 7153a7caca4e40e43e58755a3a9c11cc48747dd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 06:26:27 +0000 Subject: [PATCH 079/161] backward-cpp: 1.3 -> 1.6 --- pkgs/development/libraries/backward-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix index 03f49c3ee504..125e3799f572 100644 --- a/pkgs/development/libraries/backward-cpp/default.nix +++ b/pkgs/development/libraries/backward-cpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "backward"; - version = "1.3"; + version = "1.6"; src = fetchFromGitHub { owner = "bombela"; repo = "backward-cpp"; rev = "v${version}"; - sha256 = "1nx77qamal53rq8qxsjzax6ljawb345a1v3cqmfwa0hx26srxcln"; + sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw="; }; installPhase = '' From a3fb7cfc3ab8dd032b74accb767a8b02867bdf51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 06:58:22 +0000 Subject: [PATCH 080/161] cinny-desktop: 2.1.1 -> 2.1.2 --- .../networking/instant-messengers/cinny-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index c6d135a02892..0da3d38e6759 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "cinny-desktop"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; - sha256 = "sha256-4jd+N3a+u+c+XLwgr8BvvdkVLzo+xTBKFdjiQeu7NJU="; + sha256 = "sha256-JLu6xAnUaeRTM/yj2Qsc7pXTRXCnvxx8NL2fDXyAUg0="; }; nativeBuildInputs = [ From 3a57080baad0f09d732fc288ffc7fe0e7626b728 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Sat, 13 Aug 2022 16:52:38 +0300 Subject: [PATCH 081/161] upbound: init at 0.12.2 --- pkgs/development/tools/upbound/default.nix | 32 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/upbound/default.nix diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/development/tools/upbound/default.nix new file mode 100644 index 000000000000..e1ff9841353d --- /dev/null +++ b/pkgs/development/tools/upbound/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "upbound"; + version = "0.12.2"; + + src = fetchFromGitHub { + owner = pname; + repo = "up"; + rev = "v${version}"; + sha256 = "sha256-tbYUxqDtMIlHJ+bIE9PDDhPTSQKaZYObuRFSyRkh8+Y="; + }; + + vendorSha256 = "sha256-EeGNH/ka9Mt0vVtZfizXdTqf1f3H1aM5GITUyp+2FxM="; + + subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/upbound/up/internal/version.version=v${version}" + ]; + + meta = with lib; { + description = + "CLI for interacting with Upbound Cloud, Upbound Enterprise, and Universal Crossplane (UXP)"; + homepage = "https://upbound.io"; + license = licenses.asl20; + maintainers = with maintainers; [ lucperkins ]; + mainProgram = "up"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 445e64d696ac..b6a92b946d94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11639,6 +11639,8 @@ with pkgs; up = callPackage ../tools/misc/up { }; + upbound = callPackage ../development/tools/upbound { }; + upterm = callPackage ../tools/misc/upterm { }; upx = callPackage ../tools/compression/upx { }; From 664b01f0829987affdaa361207bfd0b698db0ec2 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 14 Aug 2022 16:34:47 +0900 Subject: [PATCH 082/161] nixos/mirakurun: set the LOGO_DATA_DIR_PATH environment variable --- nixos/modules/services/video/mirakurun.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/video/mirakurun.nix b/nixos/modules/services/video/mirakurun.nix index 90119361afab..6891b84ff455 100644 --- a/nixos/modules/services/video/mirakurun.nix +++ b/nixos/modules/services/video/mirakurun.nix @@ -189,6 +189,7 @@ in CHANNELS_CONFIG_PATH = "/etc/mirakurun/channels.yml"; SERVICES_DB_PATH = "/var/lib/mirakurun/services.json"; PROGRAMS_DB_PATH = "/var/lib/mirakurun/programs.json"; + LOGO_DATA_DIR_PATH = "/var/lib/mirakurun/logos"; NODE_ENV = "production"; }; From a3cdf49dbf5483656a22e5f7481892022b59e577 Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Sun, 14 Aug 2022 15:42:27 +0800 Subject: [PATCH 083/161] ppsspp: add SDL and headless Change the default ppsspp package to SDL frontend, as it supports vulkan, and is allowed to build the headless binary together. --- .../applications/emulators/ppsspp/default.nix | 157 +++++++++++------- pkgs/top-level/all-packages.nix | 12 +- 2 files changed, 111 insertions(+), 58 deletions(-) diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 1264768f387d..6281cbd2c088 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -3,76 +3,119 @@ , fetchFromGitHub , SDL2 , cmake +, copyDesktopItems , ffmpeg , glew +, libffi , libzip +, makeDesktopItem +, makeWrapper , pkg-config , python3 -, qtbase -, qtmultimedia +, qtbase ? null +, qtmultimedia ? null , snappy -, wrapQtAppsHook +, vulkan-loader +, wayland +, wrapQtAppsHook ? null , zlib +, enableVulkan ? true +, forceWayland ? false }: -stdenv.mkDerivation (finalAttrs: { - pname = "ppsspp"; - version = "1.13.1"; +let + enableQt = (qtbase != null); + frontend = if enableQt then "Qt" else "SDL and headless"; + vulkanPath = lib.makeLibraryPath [ vulkan-loader ]; - src = fetchFromGitHub { - owner = "hrydgard"; - repo = "ppsspp"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - sha256 = "sha256-WsFy2aSOmkII2Lte5et4W6qj0AXUKWWkYe88T0OQP08="; - }; + # experimental, see https://github.com/hrydgard/ppsspp/issues/13845 + vulkanWayland = enableVulkan && forceWayland; +in + # Only SDL front end needs to specify whether to use Wayland + assert forceWayland -> !enableQt; + stdenv.mkDerivation (finalAttrs: { + pname = "ppsspp" + + lib.optionalString enableQt "-qt" + + lib.optionalString (!enableQt) "-sdl" + + lib.optionalString forceWayland "-wayland"; + version = "1.13.1"; - postPatch = '' - substituteInPlace git-version.cmake --replace unknown ${finalAttrs.src.rev} - substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share - ''; + src = fetchFromGitHub { + owner = "hrydgard"; + repo = "ppsspp"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + sha256 = "sha256-WsFy2aSOmkII2Lte5et4W6qj0AXUKWWkYe88T0OQP08="; + }; - nativeBuildInputs = [ - cmake - pkg-config - python3 - wrapQtAppsHook - ]; + postPatch = '' + substituteInPlace git-version.cmake --replace unknown ${finalAttrs.src.rev} + substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share + ''; - buildInputs = [ - SDL2 - ffmpeg - glew - libzip - qtbase - qtmultimedia - snappy - zlib - ]; + nativeBuildInputs = [ + cmake + copyDesktopItems + makeWrapper + pkg-config + python3 + wrapQtAppsHook + ]; - cmakeFlags = [ - "-DHEADLESS=OFF" - "-DOpenGL_GL_PREFERENCE=GLVND" - "-DUSE_SYSTEM_FFMPEG=ON" - "-DUSE_SYSTEM_LIBZIP=ON" - "-DUSE_SYSTEM_SNAPPY=ON" - "-DUSING_QT_UI=ON" - ]; + buildInputs = [ + SDL2 + ffmpeg + (glew.override { enableEGL = forceWayland; }) + libzip + qtbase + qtmultimedia + snappy + zlib + ] ++ lib.optional enableVulkan vulkan-loader + ++ lib.optionals vulkanWayland [ wayland libffi ]; - installPhase = '' - runHook preInstall - mkdir -p $out/share/ppsspp - install -Dm555 PPSSPPQt $out/bin/ppsspp - mv assets $out/share/ppsspp - runHook postInstall - ''; + cmakeFlags = [ + "-DHEADLESS=${if enableQt then "OFF" else "ON"}" + "-DOpenGL_GL_PREFERENCE=GLVND" + "-DUSE_SYSTEM_FFMPEG=ON" + "-DUSE_SYSTEM_LIBZIP=ON" + "-DUSE_SYSTEM_SNAPPY=ON" + "-DUSE_WAYLAND_WSI=${if vulkanWayland then "ON" else "OFF"}" + "-DUSING_QT_UI=${if enableQt then "ON" else "OFF"}" + ]; - meta = with lib; { - homepage = "https://www.ppsspp.org/"; - description = "A HLE Playstation Portable emulator, written in C++"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; -}) -# TODO: add SDL headless port + desktopItems = [(makeDesktopItem { + desktopName = "PPSSPP"; + name = "ppsspp"; + exec = "ppsspp"; + icon = "ppsspp"; + comment = "Play PSP games on your computer"; + categories = [ "Game" "Emulator" ]; + })]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/{applications,ppsspp} + '' + (if enableQt then '' + install -Dm555 PPSSPPQt $out/bin/ppsspp + wrapProgram $out/bin/ppsspp \ + '' else '' + install -Dm555 PPSSPPHeadless $out/bin/ppsspp-headless + install -Dm555 PPSSPPSDL $out/share/ppsspp/ + makeWrapper $out/share/ppsspp/PPSSPPSDL $out/bin/ppsspp \ + --set SDL_VIDEODRIVER ${if forceWayland then "wayland" else "x11"} \ + '') + lib.optionalString enableVulkan '' + --prefix LD_LIBRARY_PATH : ${vulkanPath} \ + '' + "\n" + '' + mv assets $out/share/ppsspp + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.ppsspp.org/"; + description = "A HLE Playstation Portable emulator, written in C++ (${frontend})"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; + }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ff8d0d543c9..0b93518f6c89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1493,8 +1493,18 @@ with pkgs; pcsxr = callPackage ../applications/emulators/pcsxr { }; - ppsspp = callPackage ../applications/emulators/ppsspp { + ppsspp = callPackage ../applications/emulators/ppsspp { }; + + ppsspp-sdl = ppsspp; + + ppsspp-sdl-wayland = ppsspp.override { + forceWayland = true; + enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/13845 + }; + + ppsspp-qt = ppsspp.override { inherit (libsForQt5) qtbase qtmultimedia wrapQtAppsHook; + enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628 }; proton-caller = callPackage ../applications/emulators/proton-caller { }; From e4b89c06c398e3b89730bad725c838dc3ca27816 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 14 Aug 2022 17:08:52 +0900 Subject: [PATCH 084/161] sourcetrail: remove --- .../editors/vim/plugins/aliases.nix | 1 + .../editors/vim/plugins/generated.nix | 12 - .../editors/vim/plugins/vim-plugin-names | 1 - .../development/tools/sourcetrail/default.nix | 275 ------------------ .../sourcetrail/disable-failing-tests.patch | 48 --- .../tools/sourcetrail/disable-updates.patch | 13 - pkgs/development/tools/sourcetrail/java.nix | 28 -- pkgs/development/tools/sourcetrail/jedi.nix | 36 --- pkgs/development/tools/sourcetrail/parso.nix | 29 -- pkgs/development/tools/sourcetrail/python.nix | 72 ----- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 10 - 12 files changed, 3 insertions(+), 524 deletions(-) delete mode 100644 pkgs/development/tools/sourcetrail/default.nix delete mode 100644 pkgs/development/tools/sourcetrail/disable-failing-tests.patch delete mode 100644 pkgs/development/tools/sourcetrail/disable-updates.patch delete mode 100644 pkgs/development/tools/sourcetrail/java.nix delete mode 100644 pkgs/development/tools/sourcetrail/jedi.nix delete mode 100644 pkgs/development/tools/sourcetrail/parso.nix delete mode 100644 pkgs/development/tools/sourcetrail/python.nix diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 955590cafe31..d7db61d42839 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -130,6 +130,7 @@ mapAliases (with prev; { unite = unite-vim; UltiSnips = ultisnips; vim-addon-vim2nix = vim2nix; + vim-sourcetrail = throw "vim-sourcetrail has been removed: abandoned by upstream"; # Added 2022-08-14 vimproc = vimproc-vim; vimshell = vimshell-vim; vinegar = vim-vinegar; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 38f9e8c10513..a6f5c1ba8ee0 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11540,18 +11540,6 @@ final: prev: meta.homepage = "https://github.com/christoomey/vim-sort-motion/"; }; - vim-sourcetrail = buildVimPluginFrom2Nix { - pname = "vim-sourcetrail"; - version = "2021-02-16"; - src = fetchFromGitHub { - owner = "CoatiSoftware"; - repo = "vim-sourcetrail"; - rev = "c9c621a7ab81c52a661457ccf33a64fd7c56fd9d"; - sha256 = "192f69yz1hh2k0b2kcvfvv1jirjcvnbxvjkagmlkkqcg8w32nmlg"; - }; - meta.homepage = "https://github.com/CoatiSoftware/vim-sourcetrail/"; - }; - vim-speeddating = buildVimPluginFrom2Nix { pname = "vim-speeddating"; version = "2021-04-29"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index cb7a8c114daa..2dd0297e293d 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -969,7 +969,6 @@ https://github.com/honza/vim-snippets/,, https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets https://github.com/tomlion/vim-solidity/,, https://github.com/christoomey/vim-sort-motion/,, -https://github.com/CoatiSoftware/vim-sourcetrail/,, https://github.com/tpope/vim-speeddating/,, https://github.com/kbenzie/vim-spirv/,, https://github.com/mhinz/vim-startify/,, diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix deleted file mode 100644 index 6ba4eecac480..000000000000 --- a/pkgs/development/tools/sourcetrail/default.nix +++ /dev/null @@ -1,275 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, callPackage, writeScript, fetchpatch, cmake -, wrapQtAppsHook, qt5, boost, llvmPackages, gcc, jdk, maven, pythonPackages -, coreutils, which, desktop-file-utils, shared-mime-info, imagemagick, libicns -}: - -let - # TODO: remove when version incompatibility issue with python3Packages.jedi is - # resolved - parso = pythonPackages.callPackage ./parso.nix { }; - jedi = pythonPackages.callPackage ./jedi.nix { inherit parso; }; - - pythonIndexer = - pythonPackages.callPackage ./python.nix { inherit jedi parso; }; - javaIndexer = callPackage ./java.nix { }; - - appPrefixDir = if stdenv.isDarwin then - "$out/Applications/Sourcetrail.app/Contents" - else - "$out/opt/sourcetrail"; - appBinDir = - if stdenv.isDarwin then "${appPrefixDir}/MacOS" else "${appPrefixDir}/bin"; - appResourceDir = if stdenv.isDarwin then - "${appPrefixDir}/Resources" - else - "${appPrefixDir}/share"; - - # Upstream script: - # https://github.com/CoatiSoftware/Sourcetrail/blob/master/script/update_java_indexer.sh - installJavaIndexer = writeScript "update_java_indexer.sh" '' - #!${stdenv.shell} - - cd "$(dirname "$0")/.." - dst="${appResourceDir}/data/java/lib" - - mkdir -p "$dst" - cp "${javaIndexer}/target/java-indexer-1.0.jar" "$dst/java-indexer.jar" - cp -r java_indexer/lib/*.jar "$dst" - ''; - - # Upstream script: - # https://github.com/CoatiSoftware/Sourcetrail/blob/master/script/download_python_indexer.sh - installPythonIndexer = writeScript "download_python_indexer.sh" '' - #!${stdenv.shell} - - mkdir -p ${appResourceDir}/data - ln -s "${pythonIndexer}/bin" "${appResourceDir}/data/python" - ''; -in stdenv.mkDerivation rec { - pname = "sourcetrail"; - # NOTE: skip 2020.4.35 https://github.com/CoatiSoftware/Sourcetrail/pull/1136 - version = "2020.2.43"; - - src = fetchFromGitHub { - owner = "CoatiSoftware"; - repo = "Sourcetrail"; - rev = version; - sha256 = "0jp9y86xzkcxikc1cn4f6gqgg6zdssck08677ldagw25p1zadvzw"; - }; - - patches = let - url = commit: - "https://github.com/CoatiSoftware/Sourcetrail/commit/${commit}.patch"; - in [ - ./disable-updates.patch - ./disable-failing-tests.patch # FIXME: 5 test cases failing due to sandbox - # TODO: remove on next release - (fetchpatch { - name = "fix-filecopy.patch"; - url = url "d079d1787c9e5cadcf41a003666dc0746cc1cda0"; - sha256 = "0mixy2a4s16kv2q89k7y4dv21wnv2zd86i4gdwn3xz977y8hf92b"; - }) - (fetchpatch { - name = "fix-broken-test.patch"; - url = url "85329174bac8a301733100dc4540258f977e2c5a"; - sha256 = "17l4417sbmkrgr6v3fbazlmkzl9774zrpjv2n9zwfrz52y30f7b9"; - }) - ]; - - nativeBuildInputs = [ - cmake - jdk - wrapQtAppsHook - desktop-file-utils - imagemagick - javaIndexer # the resulting jar file is copied by our install script - ] ++ lib.optional (stdenv.isDarwin) libicns - ++ lib.optionals doCheck testBinPath; - buildInputs = [ boost pythonIndexer shared-mime-info ] - ++ (with qt5; [ qtbase qtsvg ]) ++ (with llvmPackages; [ libclang llvm ]); - binPath = [ gcc jdk.jre maven which ]; - testBinPath = binPath ++ [ coreutils ]; - - cmakeFlags = [ - "-DBoost_USE_STATIC_LIBS=OFF" - "-DBUILD_CXX_LANGUAGE_PACKAGE=ON" - "-DBUILD_JAVA_LANGUAGE_PACKAGE=ON" - "-DBUILD_PYTHON_LANGUAGE_PACKAGE=ON" - ] ++ lib.optional stdenv.isLinux - "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" - ++ lib.optional stdenv.isDarwin - "-DClang_DIR=${llvmPackages.clang-unwrapped}"; - - postPatch = let - major = lib.versions.major version; - minor = lib.versions.minor version; - patch = lib.versions.patch version; - in '' - # Upstream script obtains it's version from git: - # https://github.com/CoatiSoftware/Sourcetrail/blob/master/cmake/version.cmake - cat > cmake/version.cmake < mavenPaths = utility::getMavenExecutablePathDetector()->getPaths(); - - REQUIRE(!mavenPaths.empty()); -diff --git a/src/test/UtilityMavenTestSuite.cpp b/src/test/UtilityMavenTestSuite.cpp -index f48fe2b6..363ef64a 100644 ---- a/src/test/UtilityMavenTestSuite.cpp -+++ b/src/test/UtilityMavenTestSuite.cpp -@@ -17,6 +17,7 @@ TEST_CASE("maven path detector is working") - - TEST_CASE("maven wrapper detects source directories of simple projects") - { -+ return; - std::shared_ptr mavenPathDetector = utility::getMavenExecutablePathDetector(); - REQUIRE(!mavenPathDetector->getPaths().empty()); - -@@ -41,6 +42,7 @@ TEST_CASE("maven wrapper detects source directories of simple projects") - - TEST_CASE("maven wrapper detects source and test directories of simple projects") - { -+ return; - std::shared_ptr mavenPathDetector = utility::getMavenExecutablePathDetector(); - REQUIRE(!mavenPathDetector->getPaths().empty()); - -@@ -65,6 +67,7 @@ TEST_CASE("maven wrapper detects source and test directories of simple projects" - - TEST_CASE("maven wrapper detects source directories of nested modules") - { -+ return; - std::shared_ptr mavenPathDetector = utility::getMavenExecutablePathDetector(); - REQUIRE(!mavenPathDetector->getPaths().empty()); - -@@ -101,6 +104,7 @@ TEST_CASE("maven wrapper detects source directories of nested modules") - - TEST_CASE("maven wrapper detects source and test directories of nested modules") - { -+ return; - std::shared_ptr mavenPathDetector = utility::getMavenExecutablePathDetector(); - REQUIRE(!mavenPathDetector->getPaths().empty()); - diff --git a/pkgs/development/tools/sourcetrail/disable-updates.patch b/pkgs/development/tools/sourcetrail/disable-updates.patch deleted file mode 100644 index 112af857c59e..000000000000 --- a/pkgs/development/tools/sourcetrail/disable-updates.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lib/settings/ApplicationSettings.cpp b/src/lib/settings/ApplicationSettings.cpp -index 1be13ccd..db6098e1 100644 ---- a/src/lib/settings/ApplicationSettings.cpp -+++ b/src/lib/settings/ApplicationSettings.cpp -@@ -593,7 +593,7 @@ void ApplicationSettings::setUserToken(std::string token) - - bool ApplicationSettings::getAutomaticUpdateCheck() const - { -- return getValue("user/update_check/automatic", true); -+ return false; - } - - void ApplicationSettings::setAutomaticUpdateCheck(bool automaticUpdates) diff --git a/pkgs/development/tools/sourcetrail/java.nix b/pkgs/development/tools/sourcetrail/java.nix deleted file mode 100644 index 7e5bd75f84aa..000000000000 --- a/pkgs/development/tools/sourcetrail/java.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, pkgs, javaPackages }: - -let - javaIndexer = javaPackages.mavenbuild { - name = "sourcetrail-java-indexer-${pkgs.sourcetrail.version}"; - src = pkgs.sourcetrail.src; - m2Path = "com/sourcetrail/java-indexer"; - - # This doesn't include all required dependencies. We still rely on binary - # copies of maven packages included in the source repo for building. - mavenDeps = with javaPackages; [ - mavenCompiler_3_2 - plexusCompilerApi_2_4 - plexusCompilerJavac_2_4 - plexusCompilerManager_2_4 - ]; - - meta = { - description = "Java indexer for Sourcetrail"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - }; - }; -in -javaIndexer.overrideAttrs (drv: { - postUnpack = '' - export sourceRoot=''${sourceRoot}/java_indexer - ''; -}) diff --git a/pkgs/development/tools/sourcetrail/jedi.nix b/pkgs/development/tools/sourcetrail/jedi.nix deleted file mode 100644 index 93650c9027a4..000000000000 --- a/pkgs/development/tools/sourcetrail/jedi.nix +++ /dev/null @@ -1,36 +0,0 @@ -# Taken from a past commit of nixpkgs - -{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }: - -buildPythonPackage rec { - pname = "jedi"; - - # TODO: Remove this package when version incompatibility issue with - # python3Packages.jedi is resolved. - # - # Upstream requirements: - # https://github.com/CoatiSoftware/SourcetrailPythonIndexer#requirements - version = "0.17.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20"; - }; - - checkInputs = [ pytest glibcLocales tox pytest-cov ]; - - propagatedBuildInputs = [ parso ]; - - checkPhase = '' - LC_ALL="en_US.UTF-8" py.test test - ''; - - # tox required for tests: https://github.com/davidhalter/jedi/issues/808 - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/davidhalter/jedi"; - description = "An autocompletion tool for Python that can be used for text editors"; - license = licenses.lgpl3Plus; - }; -} diff --git a/pkgs/development/tools/sourcetrail/parso.nix b/pkgs/development/tools/sourcetrail/parso.nix deleted file mode 100644 index bd5d5b86ac51..000000000000 --- a/pkgs/development/tools/sourcetrail/parso.nix +++ /dev/null @@ -1,29 +0,0 @@ -# Taken from a past commit of nixpkgs - -{ lib -, buildPythonPackage -, fetchPypi -, pytest -}: - -buildPythonPackage rec { - pname = "parso"; - - # TODO: Remove along with ./jedi.nix when version compatiblity issue is - # resolved. - version = "0.7.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "908e9fae2144a076d72ae4e25539143d40b8e3eafbaeae03c1bfe226f4cdf12c"; - }; - - checkInputs = [ pytest ]; - - meta = { - description = "A Python Parser"; - homepage = "https://github.com/davidhalter/parso"; - license = lib.licenses.mit; - }; - -} diff --git a/pkgs/development/tools/sourcetrail/python.nix b/pkgs/development/tools/sourcetrail/python.nix deleted file mode 100644 index f9ea96463207..000000000000 --- a/pkgs/development/tools/sourcetrail/python.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, wrapPython, python, jedi, parso, cmake, swig }: - -stdenv.mkDerivation rec { - pname = "SourcetrailPythonIndexer"; - version = "v1_db25_p5"; - - src = fetchFromGitHub { - owner = "CoatiSoftware"; - repo = pname; - rev = version; - sha256 = "01jaigxigq6dvfwq018gn9qw7i6p4jm0y71lqzschfv9vwf6ga45"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ wrapPython cmake swig ]; - buildInputs = [ python ]; - pythonPath = [ jedi parso ]; - - dontUseCmakeConfigure = true; - cmakeFlags = [ - "-DBUILD_BINDINGS_PYTHON=1" - "-DPYTHON_VERSION=${lib.versions.majorMinor python.version}" - ]; - - buildPhase = '' - pushd SourcetrailDB - cmake -Bbuild $cmakeFlags . - pushd build - make -j $NIX_BUILD_CORES - popd - popd - '' + lib.optionalString stdenv.isDarwin '' - pushd SourcetrailDB/build/bindings_python - cp _sourcetraildb.dylib _sourcetraildb.so - popd - ''; - - checkPhase = '' - buildPythonPath "$pythonPath" - - # FIXME: some tests are failing - # PYTHONPATH="$program_PYTHONPATH:SourcetrailDB/build/bindings_python" \ - # ${python}/bin/python test.py - PYTHONPATH="$program_PYTHONPATH:SourcetrailDB/build/bindings_python" \ - ${python}/bin/python test_shallow.py - ''; - - installPhase = '' - shopt -s extglob - mkdir -p $out/{bin,libexec} - - cp !(run).py $out/libexec # copy *.py excluding run.py (needs extglob) - cat <(echo '#!/usr/bin/env python') run.py > $out/libexec/run.py - chmod +x $out/libexec/run.py - ln -s $out/libexec/run.py $out/bin/SourcetrailPythonIndexer - - pushd SourcetrailDB/build/bindings_python - cp sourcetraildb.py $out/libexec - cp _sourcetraildb.so $out/libexec/_sourcetraildb.so - popd - - wrapPythonProgramsIn "$out/libexec" "$pythonPath" - ''; - - doCheck = true; - - meta = with lib; { - description = "Python indexer for Sourcetrail"; - homepage = "https://github.com/CoatiSoftware/SourcetrailPythonIndexer"; - license = licenses.gpl3; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3ea7c71457a6..d69c6d8dcfd6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1328,6 +1328,8 @@ mapAliases ({ source-han-serif-simplified-chinese = source-han-serif; source-han-serif-traditional-chinese = source-han-serif; + sourcetrail = throw "sourcetrail has been removed: abandoned by upstream"; # Added 2022-08-14 + spaceOrbit = throw "'spaceOrbit' has been renamed to/replaced by 'space-orbit'"; # Converted to throw 2022-02-22 spectral = neochat; # Added 2020-12-27 speech_tools = throw "'speech_tools' has been renamed to/replaced by 'speech-tools'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ff8d0d543c9..cc7d259174c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30612,16 +30612,6 @@ with pkgs; spotify = callPackage ../applications/audio/spotify/wrapper.nix { }; - sourcetrail = let - llvmPackages = llvmPackages_10; - in libsForQt5.callPackage ../development/tools/sourcetrail { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - jdk = jdk8; - pythonPackages = python3Packages; - inherit llvmPackages; - boost = boost16x; # Filesystem tests in the checkPhase fail with Boost 1.77 - }; - spotifywm = callPackage ../applications/audio/spotifywm { }; psst = callPackage ../applications/audio/psst { }; From ffb91d08a917b2fb8b74bc7c49b96a5092aa00fa Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Sun, 14 Aug 2022 12:02:54 +0200 Subject: [PATCH 085/161] pythonPackages.nix-prefetch-github: v5.2.0 -> v5.2.1 --- .../python-modules/nix-prefetch-github/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 41f5dbfc2f64..6b5b42e368cf 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "5.2.0"; + version = "5.2.1"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "MDyoO1mJaTh+y9XDfhRcKHQcSJcsdKB9g1d+ede4znU="; + sha256 = "etmlRavPzJKLmyw3PYMgeMveFj4aVi38crHjdtDuaLg="; }; checkInputs = [ git which ]; From bb202ec7218af0327d8b9b87758a96a35e1e6e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 13 Aug 2022 20:49:43 +0000 Subject: [PATCH 086/161] randomx: 1.1.9 -> 1.1.10 --- pkgs/development/libraries/randomx/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 68e81866e1e6..b5da1ad6e198 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.9"; + version = "1.1.10"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "188fh4l8wda1y9vxa9asbk8nw35gyapw7gyn4w2p2qspdjhi5mnq"; + sha256 = "sha256-ZPphhZFzQL72xcEp9kNfZITY4oqK930ve/bbljTYNBs="; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6316fc0fe4c..37582f345118 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20994,7 +20994,7 @@ with pkgs; qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; - randomx = callPackage ../development/libraries/randomx { }; + randomx = darwin.apple_sdk_11_0.callPackage ../development/libraries/randomx { }; remodel = callPackage ../development/tools/remodel { inherit (darwin.apple_sdk.frameworks) Security; From 374734c52b6086478239143ebbdaf0d422ded711 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 14 Aug 2022 12:25:50 +0100 Subject: [PATCH 087/161] mutt: 2.2.6 -> 2.2.7 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 4d7f62bde9af..cc3bba9528e9 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { pname = "mutt"; - version = "2.2.6"; + version = "2.2.7"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "/6LZNRfPxgb+Adr/xfEuQgYqHBNNO5r3hITrxUMIiNM="; + sha256 = "6xOFj1i7Np9He/ZS2Q6baq3dDWEKy+o0VQSeXvrTbfE="; }; patches = lib.optional smimeSupport (fetchpatch { From 96958813c322ed90e67ffb0586b653d86bcc3f6f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 14 Aug 2022 12:57:48 +0100 Subject: [PATCH 088/161] nano: 6.3 -> 6.4 Changes: https://lists.gnu.org/archive/html/info-gnu/2022-08/msg00001.html --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 20b18814cb75..5d4d84e6fe9b 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "6.3"; + version = "6.4"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "61MtpJhWcnMLUA9oXbqriFpGbQj7v3QVgyuVgF5vhoc="; + sha256 = "QZmujKeKd5beVt4aQbgh3EeRLAMH6YFrVswxffNGYcA="; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From c37112d2d017bec5556fc2b12aa394aaca356958 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 14:11:37 +0000 Subject: [PATCH 089/161] messer-slim: 3.7.1 -> 4.0 --- pkgs/applications/science/biology/messer-slim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 79cce7b9f744..3b12e12a2258 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "3.7.1"; + version = "4.0"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-3ox+9hzqI8s4gmEkQ3Xm1Ih639LBtcSJNNmJgbpWaoM="; + sha256 = "sha256-2iEflSDknlQtCLz2MvEZExOT+MQlEYOMY2JI0XE6mw0="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; From 8180b124bf8690ff3455c7def3832cd68727fb3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 14:14:05 +0000 Subject: [PATCH 090/161] oh-my-zsh: 2022-07-26 -> 2022-08-10 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 36f2b04eabce..9ce36876e57b 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-07-26"; + version = "2022-08-10"; pname = "oh-my-zsh"; - rev = "bb6c14cdfd0b7d543d0d9c2e5f0c0a9409a82084"; + rev = "835a0a5d17765243cabee782acb5905a9aab33c3"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "jlQKnF5vZp7ARVXtV/WEnTIV0m5FwqTj83igDyMyTTQ="; + sha256 = "dPFoa5dgU5+A3wRJQShD42AkZ0n3mm3+6j4tzc7mucQ="; }; strictDeps = true; From c8e49f8f29471e945cba60ba211919b5e7b943e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 14:37:34 +0000 Subject: [PATCH 091/161] minio: 2022-08-11T04-37-28Z -> 2022-08-13T21-54-44Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index e497f8099f9b..f70cf24e482c 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-08-11T04-37-28Z"; + version = "2022-08-13T21-54-44Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-gxDTHy/CDqeQhf/RZaaoloGEfAOg9djjIWdWyb+7fhM="; + sha256 = "sha256-+N/IFVyidbu4ns9Pw27D8lxAeSk+KpIIRZOkfxlJQ+Q="; }; - vendorSha256 = "sha256-LSAB+0+yNsxi5qCXEBVf3aE8Rt+UP63AIGBV5OhWJDY="; + vendorSha256 = "sha256-spWmI2an9NW5iMWw7yPDZQ2s0iVjNqnbRY867bBBwAE="; doCheck = false; From 2a8ce2f681df5f145be67d97852b70b9f6ad4816 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 16:36:47 +0000 Subject: [PATCH 092/161] oq: 1.3.2 -> 1.3.3 --- pkgs/development/tools/oq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix index d8fcbdf424b3..fbbfd861a52e 100644 --- a/pkgs/development/tools/oq/default.nix +++ b/pkgs/development/tools/oq/default.nix @@ -8,13 +8,13 @@ crystal.buildCrystalPackage rec { pname = "oq"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "Blacksmoke16"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iGKyP3NrAnR3ISOBq+YR/vwarlnIY4u4ZwdqSBnBC7U="; + sha256 = "sha256-1IdOyfoGAsZ5bOEJoj9Ol3sxsiq18hfniqW1ATBEGc8="; }; nativeBuildInputs = [ makeWrapper ]; From b932bf6fc697674c5d53bad8621a6ab15083b85c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 22:35:23 +0200 Subject: [PATCH 093/161] python310Packages.aiohue: 4.4.2 -> 4.5.0 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 99defb3f6964..657ebc1aa9a1 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.4.2"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - hash = "sha256-rHd5mQlD/4enGgFyVRVnLXG1Fcd+8hyQj+WnF8QFqm0="; + hash = "sha256-Lcs+Ieh5TEUE+sHqFAZr9rsAZMsI9t2/w87r36IUa1A="; }; propagatedBuildInputs = [ From 4929601fe98960014a7b8a9e6bb491432178e398 Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Sun, 14 Aug 2022 22:58:44 +0200 Subject: [PATCH 094/161] bitwuzla: unstable-2021-07-01 -> unstable-2022-08-07 --- pkgs/applications/science/logic/bitwuzla/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index a8820b55b746..82bfbd6dc3fe 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "bitwuzla"; - version = "unstable-2021-07-01"; + version = "unstable-2022-08-07"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; - rev = "58d720598e359b1fdfec4a469c76f1d1f24db51a"; - sha256 = "06ymqsdppyixb918161rmbgqvbnarj4nm4az88lkn3ri4gyimw04"; + rev = "b6fb61736a5cf70cd0b35ec4aeeadf23971610ce"; + hash = "sha256-T5VnnWrcZ8K1NjFf5eeg0TRpXBLRCxC67v8zWPwYF/Y="; }; nativeBuildInputs = [ cmake pkg-config ]; From 35980a2c246c12f084dcf724d997087498725424 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 21:03:27 +0000 Subject: [PATCH 095/161] ticker: 4.5.2 -> 4.5.3 --- pkgs/applications/misc/ticker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index 2ffa499f74a3..a5e46b6e34c8 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ticker"; - version = "4.5.2"; + version = "4.5.3"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9Gy7G/uRFUBfXlUa6nIle1WIS5Yf9DJMM57hE0oEyLI="; + sha256 = "sha256-qrPBQuHwfwFI4PQXDikfo8hm64Sdg4czeeKWyD5HqNk="; }; vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; From 08e9805a36264312f793cb99bcae3871d4a51388 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 21:06:15 +0000 Subject: [PATCH 096/161] tilt: 0.30.6 -> 0.30.7 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index ade1b6ebfd9a..f569db785171 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.30.6"; + version = "0.30.7"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i4i406Ys3MY77t4oN+kIeWopdjtfysm4xDFkTpuo+X0="; + sha256 = "sha256-zYP9bn3wC5FJwCdDJEBunaEHoFhRKlH7Mec/Stvp76A="; }; vendorSha256 = null; From 219c2c7942dc38e9d83f4e4bc708c185b4ecde31 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Fri, 12 Aug 2022 12:20:24 +0200 Subject: [PATCH 097/161] prl-tools: 17.1.4-51567 -> 18.0.0-53049 --- pkgs/os-specific/linux/prl-tools/default.nix | 8 +- .../linux/prl-tools/prl-tools-5.18.patch | 143 ------------------ .../linux/prl-tools/prl-tools-5.19.patch | 29 ---- 3 files changed, 2 insertions(+), 178 deletions(-) delete mode 100644 pkgs/os-specific/linux/prl-tools/prl-tools-5.18.patch delete mode 100644 pkgs/os-specific/linux/prl-tools/prl-tools-5.19.patch diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 9a2c23d735ab..0b4acc44400e 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -22,17 +22,16 @@ }: assert (!libsOnly) -> kernel != null; -assert lib.elem stdenv.hostPlatform.system [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; stdenv.mkDerivation rec { - version = "17.1.4-51567"; + version = "18.0.0-53049"; pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg"; - sha256 = "sha256-gjLxQOTFuVghv1Bj+zfbNW97q1IN2rurSnPQi13gzRA="; + sha256 = "sha256-MGiqCvOsu/sKz6JHJFGP5bT12XYnm2kTMdOiflg9ses="; }; hardeningDisable = [ "pic" "format" ]; @@ -56,9 +55,6 @@ stdenv.mkDerivation rec { fi ''; - patches = lib.optional (lib.versionAtLeast kernel.version "5.18") ./prl-tools-5.18.patch - ++ lib.optional (lib.versionAtLeast kernel.version "5.19") ./prl-tools-5.19.patch; - kernelVersion = lib.optionalString (!libsOnly) kernel.modDirVersion; kernelDir = lib.optionalString (!libsOnly) "${kernel.dev}/lib/modules/${kernelVersion}"; diff --git a/pkgs/os-specific/linux/prl-tools/prl-tools-5.18.patch b/pkgs/os-specific/linux/prl-tools/prl-tools-5.18.patch deleted file mode 100644 index 561371e1e84c..000000000000 --- a/pkgs/os-specific/linux/prl-tools/prl-tools-5.18.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff -puNr prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c ---- prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c -+++ prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c -@@ -382,7 +382,7 @@ static int prl_tg_initialize(struct tg_d - } - #endif - /* Set DMA ability. Only lower 4G is possible to address */ -- rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); -+ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); - if (rc) { - printk(KERN_ERR "no usable DMA configuration\n"); - goto err_out; -diff -puNr prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c ---- prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c -+++ prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c -@@ -76,7 +76,7 @@ static int tg_req_map_internal(struct TG - uple->p[i] = vmalloc_to_page(mem); - page_cache_get(uple->p[i]); - -- dst->RequestPages[i] = pci_map_page(pdev, uple->p[i], 0, PAGE_SIZE, DMA_BIDIRECTIONAL) >> PAGE_SHIFT; -+ dst->RequestPages[i] = dma_map_page(&pdev->dev, uple->p[i], 0, PAGE_SIZE, DMA_BIDIRECTIONAL) >> PAGE_SHIFT; - if (!dst->RequestPages[i]) { - page_cache_release(uple->p[i]); - goto err; -@@ -88,7 +88,7 @@ static int tg_req_map_internal(struct TG - - err: - for (i = 0; i < uple->count; i++) { -- pci_unmap_page(pdev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ dma_unmap_page(&pdev->dev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); - page_cache_release(uple->p[i]); - } - kfree(uple); -@@ -129,7 +129,7 @@ static TG_PAGED_BUFFER *tg_req_map_user_ - pfn = (u64 *)dbuf - 1; - - for (; npages > 0; npages--, mapped++) { -- dma_addr_t addr = pci_map_page(pdev, uple->p[npages-1], 0, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ dma_addr_t addr = dma_map_page(&pdev->dev, uple->p[npages-1], 0, PAGE_SIZE, DMA_BIDIRECTIONAL); - - if (!addr) { - DPRINTK("[3] %d < %d \n", got, npages); -@@ -144,7 +144,7 @@ static TG_PAGED_BUFFER *tg_req_map_user_ - - err_unmap: - for (i = 0; i < mapped; i++, pfn++) -- pci_unmap_page(pdev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ dma_unmap_page(&pdev->dev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); - - err_put: - for(i = 0; i < got; i++) -@@ -176,7 +176,7 @@ static TG_PAGED_BUFFER *tg_req_map_kerne - goto err; - } - -- addr = pci_map_page(pdev, page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ addr = dma_map_page(&pdev->dev, page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); - if (!addr) { - DPRINTK("[2] va:%p can't map\n", buffer); - goto err; -@@ -189,7 +189,7 @@ static TG_PAGED_BUFFER *tg_req_map_kerne - - err: - for (; i > 0; i--, pfn--) -- pci_unmap_page(pdev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ dma_unmap_page(&pdev->dev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); - - return ERR_PTR(-ENOMEM); - } -@@ -203,7 +203,7 @@ static inline int tg_req_unmap_internal( - dst->RequestSize + ~PAGE_MASK) >> PAGE_SHIFT; - - for (i = 0; i < count; i++) -- pci_unmap_page(req->dev->pci_dev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ dma_unmap_page(&req->dev->pci_dev->dev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); - - return count; - } -@@ -264,7 +264,7 @@ static void tg_req_unmap_pages(struct TG - - pfn = (u64 *)(dbuf + 1); - for (; npages > 0; npages--, pfn++) -- pci_unmap_page(pdev, (*pfn) << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ dma_unmap_page(&pdev->dev, (*pfn) << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); - - dbuf = (TG_PAGED_BUFFER *)pfn; - } -@@ -374,7 +374,7 @@ static int tg_req_submit(struct TG_PENDI - * also no any offset inside page needed. - */ - req->pg = vmalloc_to_page(dst); -- req->phys = pci_map_page(dev->pci_dev, vmalloc_to_page(dst), 0, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ req->phys = dma_map_page(&dev->pci_dev->dev, vmalloc_to_page(dst), 0, PAGE_SIZE, DMA_BIDIRECTIONAL); - if (!req->phys) { - DPRINTK("Can not allocate memory for DMA mapping\n"); - goto out; -@@ -405,7 +405,7 @@ static int tg_req_submit(struct TG_PENDI - out: - if (ret != TG_STATUS_PENDING) { - page_cache_release(req->pg); -- pci_unmap_page(dev->pci_dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ dma_unmap_page(&dev->pci_dev->dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); - } - - DPRINTK("EXIT\n"); -@@ -460,7 +460,7 @@ out_wait: - wait_for_completion(&req->waiting); - out: - page_cache_release(req->pg); -- pci_unmap_page(dev->pci_dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); -+ dma_unmap_page(&dev->pci_dev->dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); - DPRINTK("EXIT\n"); - return ret; - } -diff -puNr prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c ---- prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c -+++ prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 40)) && \ - (LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)) -@@ -57,7 +58,7 @@ unsigned long *prlfs_dfl( struct dentry - } - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) --#define prl_uaccess_kernel() uaccess_kernel() -+#define prl_uaccess_kernel() (false) - #else - #define prl_uaccess_kernel() segment_eq(get_fs(), KERNEL_DS) - #endif -@@ -954,7 +955,7 @@ static const struct address_space_operat - .writepage = prlfs_writepage, - .write_begin = simple_write_begin, - .write_end = prlfs_write_end, -- .set_page_dirty = __set_page_dirty_nobuffers, -+ .dirty_folio = filemap_dirty_folio, - }; - - diff --git a/pkgs/os-specific/linux/prl-tools/prl-tools-5.19.patch b/pkgs/os-specific/linux/prl-tools/prl-tools-5.19.patch deleted file mode 100644 index 5ec00e6dd02e..000000000000 --- a/pkgs/os-specific/linux/prl-tools/prl-tools-5.19.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -puNr prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c ---- prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c -+++ prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c -@@ -851,7 +851,7 @@ ssize_t prlfs_rw(struct inode *inode, char *buf, size_t size, - loff_t *off, unsigned int rw, int user, int flags); - - --int prlfs_readpage(struct file *file, struct page *page) { -+int prlfs_read_folio(struct file *file, struct folio *folio) { - char *buf; - ssize_t ret; - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) -@@ -859,6 +859,7 @@ int prlfs_readpage(struct file *file, struct page *page) { - #else - struct inode *inode = file->f_dentry->d_inode; - #endif -+ struct page *page = &folio->page; - loff_t off = page->index << PAGE_SHIFT; - - if (!file) { -@@ -950,7 +951,7 @@ out: - } - - static const struct address_space_operations prlfs_aops = { -- .readpage = prlfs_readpage, -+ .read_folio = prlfs_read_folio, - .writepage = prlfs_writepage, - .write_begin = simple_write_begin, - .write_end = prlfs_write_end, From 25b5181c2e28bb385bcfa29ece130397f03f63ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 23:10:27 +0000 Subject: [PATCH 098/161] zola: 0.16.0 -> 0.16.1 --- pkgs/applications/misc/zola/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 833b2e4c152c..9e28dbaa0b2d 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - sha256 = "sha256-FrCpHavlHf4/g96G7cY0Rymxqi73XUCIAYp4cm//2Ic="; + sha256 = "sha256-VkR7fM2WeI1itGq5kl54CVLnNW+NxIodkVKeGv8HoaU="; }; - cargoSha256 = "sha256-c6SbQasgpOyqVninAo104oYo1CXpiECZvsB1gxrD7wM="; + cargoSha256 = "sha256-74QVFjDlT3ewx4sCK4/r5In0muqboBFEpMFBv2L5YaM="; nativeBuildInputs = [ cmake From 4ad43e6b4712a6620453c9d1aecf17a628571db5 Mon Sep 17 00:00:00 2001 From: Chris Pattison Date: Thu, 11 Aug 2022 11:36:32 +0200 Subject: [PATCH 099/161] python3Packages.stim: init at 1.9.0 --- .../python-modules/stim/default.nix | 67 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/python-modules/stim/default.nix diff --git a/pkgs/development/python-modules/stim/default.nix b/pkgs/development/python-modules/stim/default.nix new file mode 100644 index 000000000000..d17f3f6e34b0 --- /dev/null +++ b/pkgs/development/python-modules/stim/default.nix @@ -0,0 +1,67 @@ +{ lib +, pkgs +, buildPythonPackage +, pythonOlder +, pytestCheckHook +, pytest-xdist +, fetchFromGitHub +, numpy +, pybind11 +, cirq-core +, matplotlib +, networkx +, scipy +, pandas +}: + +buildPythonPackage rec { + pname = "stim"; + version = "1.9.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = pkgs.fetchFromGitHub { + owner = "quantumlib"; + repo = "Stim"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-zXWdJjFkf74FCWxyVMF8dx0P8GmUkuHFxUo5wYNU2o0="; + }; + + propagatedBuildInputs = [ + numpy + pybind11 + ]; + + checkInputs = [ + pytestCheckHook + pytest-xdist + + cirq-core + matplotlib + networkx + scipy + pandas + ]; + + meta = { + description = "A tool for high performance simulation and analysis of quantum stabilizer circuits, especially quantum error correction (QEC) circuits."; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ chrispattison ]; + homepage = "https://github.com/quantumlib/stim"; + }; + + pythonImportsCheck = [ "stim" ]; + + enableParallelBuilding = true; + + disabledTestPaths = [ + # No pymatching + "glue/sample/src/sinter/main_test.py" + "glue/sample/src/sinter/decoding_test.py" + "glue/sample/src/sinter/predict_test.py" + "glue/sample/src/sinter/collection_test.py" + "glue/sample/src/sinter/collection_work_manager.py" + "glue/sample/src/sinter/worker_test.py" + ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f94580e2664..798e7588266c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10339,6 +10339,8 @@ in { stickytape = callPackage ../development/python-modules/stickytape { }; + stim = callPackage ../development/python-modules/stim { }; + stm32loader = callPackage ../development/python-modules/stm32loader { }; stone = callPackage ../development/python-modules/stone { }; From 680f04a9930fa0b9572abda5a9429cb2b1c77655 Mon Sep 17 00:00:00 2001 From: P Date: Sun, 14 Aug 2022 18:48:03 -0600 Subject: [PATCH 100/161] dhallPackages.dhall-cloudformation: init at 0.9.64 (#183813) --- .../dhall-modules/dhall-cloudformation.nix | 14 ++++++++++++++ pkgs/top-level/dhall-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/dhall-modules/dhall-cloudformation.nix diff --git a/pkgs/development/dhall-modules/dhall-cloudformation.nix b/pkgs/development/dhall-modules/dhall-cloudformation.nix new file mode 100644 index 000000000000..e99fbc3b3177 --- /dev/null +++ b/pkgs/development/dhall-modules/dhall-cloudformation.nix @@ -0,0 +1,14 @@ +{ buildDhallGitHubPackage, Prelude }: + +let + version = "0.9.64"; + +in buildDhallGitHubPackage { + name = "cloudformation"; + owner = "jcouyang"; + repo = "dhall-aws-cloudformation"; + rev = version; + sha256 = "sha256-EDbMKHORYQOKoSrbErkUnsadDiYfK1ULbFhz3D5AcXc="; + file = "package.dhall"; + dependencies = [ Prelude ]; +} diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix index 646f2b7e9d39..f43be56c59be 100644 --- a/pkgs/top-level/dhall-packages.nix +++ b/pkgs/top-level/dhall-packages.nix @@ -35,6 +35,8 @@ let lib = import ../development/dhall-modules/lib.nix { inherit lib; }; + dhall-cloudformation = callPackage ../development/dhall-modules/dhall-cloudformation.nix { }; + dhall-grafana = callPackage ../development/dhall-modules/dhall-grafana.nix { }; From a5c352edae438c7bfb9cd90bdab1e8b66518844b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 00:51:39 +0000 Subject: [PATCH 101/161] python310Packages.databricks-cli: 0.17.0 -> 0.17.1 --- pkgs/development/python-modules/databricks-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 22cbd96cae00..eafd7d2e8bc9 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.17.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SvoX2nPG6TygnF/fJPo1UpZYVLu8PxQoz00n7bdRtyw="; + sha256 = "sha256-ZfFcPfL/uqREwF8zK7KKuIn6wMnaGFOx6W/e/sPGnAw="; }; checkInputs = [ From cc45fa8d20190b7c591252bccbc9f4321b20eaf1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Aug 2022 03:45:44 +0200 Subject: [PATCH 102/161] python3Packages.django-statici18n: 2.2.0 -> 2.3.1 --- .../django-statici18n/default.nix | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index db7d36c89933..8fcfa070d2d4 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -1,19 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, django, django-appconf }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, django-appconf +, pytest-django +, pytestCheckHook +}: buildPythonPackage rec { pname = "django-statici18n"; - version = "2.2.0"; + version = "2.3.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "dbcdac190d93e0b4eabcab8875c8eb68795eceb442f926843ec5cbe1432fe628"; + src = fetchFromGitHub { + owner = "zyegfryed"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-2fFJJNdF0jspS7djDL8sToPTetzNR6pfNp5ohCNa30I="; }; - propagatedBuildInputs = [ django django-appconf ]; + propagatedBuildInputs = [ + django + django-appconf + ]; - # pypi package does not contains test harness - # source tarball requires setting up a config - doCheck = false; + pythonImportsCheck = [ + "statici18n" + ]; + + DJANGO_SETTINGS_MODULE = "tests.test_project.project.settings"; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; meta = with lib; { description = "Helper for generating Javascript catalog to static files"; From 895a5fa6e1b6f690528a96837cee6e355b4012d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 02:32:55 +0000 Subject: [PATCH 103/161] python310Packages.homeconnect: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/homeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index 19692f988fc3..a3e5c2ddb1dc 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "homeconnect"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yEBi/9FVvLYYGMvsVZO94oGXEqXOdtHQ0G+6o2LEmOQ="; + hash = "sha256-wCx8Jh3NBTnYI+essH9toacjUaT4fS61SaAAZDCYZ4g="; }; propagatedBuildInputs = [ From 8a19bf497c05b009d6040d3d0231baa4c27d57d3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 10:49:36 +0800 Subject: [PATCH 104/161] cinnamon.cinnamon-common: 5.4.9 -> 5.4.10 --- .../cinnamon/cinnamon-common/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 3581355387e5..d1db0f8a25ec 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -9,6 +9,7 @@ , cjs , clutter , fetchFromGitHub +, fetchpatch , gdk-pixbuf , libgnomekbd , glib @@ -53,18 +54,31 @@ stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.4.9"; + version = "5.4.10"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-nM87NO/dwOd+hN5/3zX7XUjyKvXh4uDhLcGFcKE9ccA="; + hash = "sha256-yNjFP32+0LXqHfJUxm1A+CTuwny5/IxxT08689f7VlE="; }; patches = [ ./use-sane-install-dir.patch ./libdir.patch + # Re-add libsoup 2.4 as dependency - needed by some applets. + # Can be removed on next update. + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/76224fe409d074f8a44c70e4fd5e1289f92800b9.patch"; + sha256 = "sha256-nDt4kkK1kVstxbij63XxTJ2L/TM9Q1P6feok3xlPQOM="; + }) + # keybindings.js: Use bindings.get(). + # Can be removed on next update. + # https://github.com/linuxmint/cinnamon/issues/11055 + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/7724e4146baf8431bc1fb55dce60984e77adef5a.patch"; + sha256 = "sha256-idGtkBa13nmoEprtmAr6OssO16wJwBd16r2ZbbhrYDQ="; + }) ]; buildInputs = [ @@ -95,7 +109,7 @@ stdenv.mkDerivation rec { gsound gtk3 json-glib - libsoup + libsoup # referenced in js/ui/environment.js libstartup_notification libXtst libXdamage From 620175f898f6d7c200ef21803a6d40e30784ec70 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 10:52:20 +0800 Subject: [PATCH 105/161] cinnamon.nemo: 5.4.2 -> 5.4.3 --- pkgs/desktops/cinnamon/nemo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 4b013050ad84..0490b2b47c7a 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.4.2"; + version = "5.4.3"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-Xn9CgGe7j2APaJRLvx58z2w+sN7ZeDScQz53ZBBnsQs="; + sha256 = "sha256-f3rO0lpOcwpSpIpKrslf6/6nqFbbGTwnKbHpWO+Uf+Q="; }; outputs = [ "out" "dev" ]; From 53abe2aa3e442414a93048e9bec79ff78204a6a4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 10:53:59 +0800 Subject: [PATCH 106/161] cinnamon.xreader: 3.4.3 -> 3.4.4 --- pkgs/desktops/cinnamon/xreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index 67983d505694..6073a57b5a49 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-GkJo/wc5StyeQv0pv5XK0Qy3o8EGpfPYY8gOMq0Afgs="; + sha256 = "sha256-uYnQE1GjkUxYlvXSJNmvr6q4OdvAWgv8HqTXk0KkRQM="; }; nativeBuildInputs = [ From ffd1c042421ec9e546cca5b314c1df65ac43930a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 10:59:24 +0800 Subject: [PATCH 107/161] sticky: 1.11 -> 1.12 --- pkgs/applications/misc/sticky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index a66fecd83b76..98c844c696ce 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -11,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sticky"; - version = "1.11"; + version = "1.12"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-PXJpNKzF9goQvfh3lUUfOaZFessFNrWtg8nMDxPxRMo="; + hash = "sha256-kAO8Qz4bTn3+YeIXAvPZ1SpKgn+g+rBgi9+TaqL1vOY="; }; postPatch = '' From 2a551f952089abe8493965db0579f953b25d12eb Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 2 Aug 2022 09:41:17 +0800 Subject: [PATCH 108/161] deluge: 2.0.5 -> 2.1.1 --- .../networking/p2p/deluge/default.nix | 138 +++++++++++------- pkgs/top-level/all-packages.nix | 11 +- 2 files changed, 92 insertions(+), 57 deletions(-) diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index c5966ae13f4d..b5bb12da0ec5 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,9 +1,8 @@ { lib , fetchurl -, fetchpatch , intltool , libtorrent-rasterbar -, pythonPackages +, python3Packages , gtk3 , glib , gobject-introspection @@ -11,62 +10,95 @@ , wrapGAppsHook }: -pythonPackages.buildPythonPackage rec { - pname = "deluge"; - version = "2.0.5"; +let + inherit (lib) optionals; - src = fetchurl { - url = "http://download.deluge-torrent.org/source/2.0/${pname}-${version}.tar.xz"; - sha256 = "sha256-xL0Eq/0hG2Uhi+A/PEbSb0QCSITeEOAYWfuFb91vJdg="; - }; + pypkgs = python3Packages; - propagatedBuildInputs = with pythonPackages; [ - twisted - Mako - chardet - pyxdg - pyopenssl - service-identity - libtorrent-rasterbar.dev - libtorrent-rasterbar.python - setuptools - setproctitle - pillow - rencode - six - zope_interface - dbus-python - pygobject3 - pycairo - gtk3 - gobject-introspection - librsvg - ]; + generic = { pname, withGUI }: + pypkgs.buildPythonPackage rec { + inherit pname; + version = "2.1.1"; - nativeBuildInputs = [ gobject-introspection intltool wrapGAppsHook glib ]; + src = fetchurl { + url = "http://download.deluge-torrent.org/source/${lib.versions.majorMinor version}/deluge-${version}.tar.xz"; + hash = "sha256-do3TGYAuQkN6s3lOvnW0lxQuCO1bD7JQO61izvRC3/c="; + }; - checkInputs = with pythonPackages; [ - pytestCheckHook - pytest-twisted - pytest-cov - mock - mccabe - pylint - ]; + propagatedBuildInputs = with pypkgs; [ + twisted + Mako + chardet + pyxdg + pyopenssl + service-identity + libtorrent-rasterbar.dev + libtorrent-rasterbar.python + setuptools + setproctitle + pillow + rencode + six + zope_interface + dbus-python + pycairo + librsvg + ] ++ optionals withGUI [ + gtk3 + gobject-introspection + pygobject3 + ]; - doCheck = false; # until pytest-twisted is packaged + nativeBuildInputs = [ + intltool + glib + ] ++ optionals withGUI [ + gobject-introspection + wrapGAppsHook + ]; - postInstall = '' - mkdir -p $out/share - cp -R deluge/ui/data/{icons,pixmaps} $out/share/ - install -Dm444 -t $out/share/applications deluge/ui/data/share/applications/deluge.desktop - ''; + checkInputs = with pypkgs; [ + pytestCheckHook + pytest-twisted + pytest-cov + mock + mccabe + pylint + ]; - meta = with lib; { - homepage = "https://deluge-torrent.org"; - description = "Torrent client"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ domenkozar ebzzry ]; - platforms = platforms.all; - }; + doCheck = false; # tests are not working at all + + postInstall = '' + install -Dm444 -t $out/lib/systemd/system packaging/systemd/*.service + '' + (if withGUI + then '' + mkdir -p $out/share + cp -R deluge/ui/data/{icons,pixmaps} $out/share/ + install -Dm444 -t $out/share/applications deluge/ui/data/share/applications/deluge.desktop + '' else '' + rm -r $out/bin/deluge-gtk + rm -r $out/lib/${python3Packages.python.libPrefix}/site-packages/deluge/ui/gtk3 + rm -r $out/share/{icons,man/man1/deluge-gtk*,pixmaps} + ''); + + postFixup = '' + for f in $out/lib/systemd/system/*; do + substituteInPlace $f --replace /usr/bin $out/bin + done + ''; + + meta = with lib; { + description = "Torrent client"; + homepage = "https://deluge-torrent.org"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ domenkozar ebzzry ]; + platforms = platforms.all; + }; + }; + +in +rec { + deluge-gtk = generic { pname = "deluge-gtk"; withGUI = true; }; + deluged = generic { pname = "deluged"; withGUI = false; }; + deluge = deluge-gtk; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10af38ffe9cf..1677132b217d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5456,11 +5456,14 @@ with pkgs; ddrutility = callPackage ../tools/system/ddrutility { }; - deluge-2_x = callPackage ../applications/networking/p2p/deluge { - pythonPackages = python3Packages; + inherit (callPackages ../applications/networking/p2p/deluge { libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; }; - }; - deluge = deluge-2_x; + }) + deluge-gtk + deluged + deluge; + + deluge-2_x = deluge; desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { }; From dd05ebc58a2611b76e65552cd959a949b8ae4290 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 03:15:17 +0000 Subject: [PATCH 109/161] python310Packages.limnoria: 2022.6.23 -> 2022.8.7 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 2291a4ffcc7d..7f95f4ae138c 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.6.23"; + version = "2022.8.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-f5xrLeIl1KbHBx8csUNKPWLX1tMiMitPULnoW4+vCtI="; + hash = "sha256-TRTqhWQSVhjJkd9FLJk1lDwdzyzkeih9zHPSOvTf2oQ="; }; propagatedBuildInputs = [ From 7fcd6a542741b78d7bf3a0d521b83f717430bed2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 03:23:41 +0000 Subject: [PATCH 110/161] python310Packages.mailsuite: 1.9.4 -> 1.9.5 --- pkgs/development/python-modules/mailsuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix index 2cb6555109cd..147686afb95c 100644 --- a/pkgs/development/python-modules/mailsuite/default.nix +++ b/pkgs/development/python-modules/mailsuite/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "mailsuite"; - version = "1.9.4"; + version = "1.9.5"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-wgutyXxo1z3GxO3xikRlA4Og+oz+7+PrY2Hs6gicO/o="; + hash = "sha256-bvS+sH10LkQkH/nAGuk/rvPjPhaR/rArIf9W9CWjFMY="; }; nativeBuildInputs = [ From 58e5bd56d67b46208a6eef2539bb000b7a146580 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 14 Aug 2022 21:20:55 -0700 Subject: [PATCH 111/161] default-crate-overrides.nix: add libevdev for evdev-rs --- pkgs/build-support/rust/default-crate-overrides.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 9f88e8a067bc..f6383af44e82 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -27,6 +27,7 @@ , freetype , rdkafka , udev +, libevdev , ... }: @@ -65,6 +66,12 @@ in buildInputs = [ dbus ]; }; + evdev-sys = attrs: { + LIBGIT2_SYS_USE_PKG_CONFIG = true; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libevdev ]; + }; + expat-sys = attrs: { nativeBuildInputs = [ cmake ]; }; From 92f6f6b72b6ebd250a3480b59166cc43d959c1df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 04:24:16 +0000 Subject: [PATCH 112/161] python310Packages.p1monitor: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/p1monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix index d1be6e639b38..efa35f67ddf2 100644 --- a/pkgs/development/python-modules/p1monitor/default.nix +++ b/pkgs/development/python-modules/p1monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "p1monitor"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-p1monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-0CPOK577tl86orjN9Xou8dPm425Yx1m8x6xfHaZEv10="; + hash = "sha256-3xvh/Ic2Mtczi5WREDXy+qQLpXhJQZf6fosT0h+fA0o="; }; nativeBuildInputs = [ From 8a36e1472b53f7adfaa9267a13967094636401d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 00:35:10 +0000 Subject: [PATCH 113/161] swaynotificationcenter: 0.6.1 -> 0.6.3 --- pkgs/applications/misc/swaynotificationcenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index 5139fec338c3..42e6dba3da45 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "SwayNotificationCenter"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; rev = "v${version}"; - hash = "sha256-+vMlhBCLxvqfPRO2U9015srhY/2sd1DoV27kzNDjsqs="; + hash = "sha256-79Kda2Mi2r38f0J12bRm9wbHiZCy9+ojPDxwlFG8EYw="; }; nativeBuildInputs = [ gobject-introspection meson ninja pkg-config scdoc vala wrapGAppsHook ]; From 6737d2cfc8987d3b01c2fde5189d3313ef2248e9 Mon Sep 17 00:00:00 2001 From: Ferdinand Bachmann Date: Tue, 9 Aug 2022 14:18:12 +0200 Subject: [PATCH 114/161] pipectl: 0.3.0 -> 0.4.1 --- pkgs/tools/misc/pipectl/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pipectl/default.nix b/pkgs/tools/misc/pipectl/default.nix index f65941e784b2..9ce250bef78e 100644 --- a/pkgs/tools/misc/pipectl/default.nix +++ b/pkgs/tools/misc/pipectl/default.nix @@ -2,20 +2,25 @@ , lib , fetchFromGitHub , cmake +, scdoc }: stdenv.mkDerivation rec { pname = "pipectl"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Ferdi265"; repo = pname; rev = "v${version}"; - hash = "sha256-+o5hIDtDAh4r+AKCUhueQ3GBYf2sZtMATGX73Qg+tbo="; + hash = "sha256-dWRem9VHzMwVo+ahUagZB2r4Ag8PyBef5X41vVpZcAc="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake scdoc ]; + + cmakeFlags = [ + "-DINSTALL_DOCUMENTATION=ON" + ]; meta = with lib; { homepage = "https://github.com/Ferdi265/pipectl"; From 13203f81c0c7c4ca9a04727fc1adfe1e16dffc95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 05:25:06 +0000 Subject: [PATCH 115/161] python310Packages.genpy: 2021.1 -> 2022.1 --- pkgs/development/python-modules/genpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/genpy/default.nix b/pkgs/development/python-modules/genpy/default.nix index d5e82332c30b..5b7600efe835 100644 --- a/pkgs/development/python-modules/genpy/default.nix +++ b/pkgs/development/python-modules/genpy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "genpy"; - version = "2021.1"; + version = "2022.1"; src = fetchPypi { inherit pname version; - sha256 = "9bc062fa98c5c466ff464d8974be81a6bf67af9247b5e5176215ad1e81a6cdac"; + sha256 = "sha256-FGZbQlUgbJjnuiDaKS/vVlraMVmFF1cAQk7S3aPWXx4="; }; propagatedBuildInputs = [ From f253ea7289d9beaa3fb8e72d3f99a2e5ca443977 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 15 Aug 2022 08:23:13 +0200 Subject: [PATCH 116/161] headscale: 0.16.1 -> 0.16.2 --- pkgs/servers/headscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 41245cb68141..db306490bd9c 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "headscale"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-uQpvIWK80+s/aFJQZGdSSrWsCwjvbpK9jLdmcFMAeLw="; + sha256 = "sha256-RgRRBz9i12mavzCBtZN8QLlIjMjG7GfkGMRJGKMJosw="; }; vendorSha256 = "sha256-RzmnAh81BN4tbzAGzJbb6CMuws8kuPJDw7aPkRRnSS8="; From 2ad332f6250934c0cb4db49e7bd6fbd5b6dcfb85 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 15 Aug 2022 08:29:42 +0200 Subject: [PATCH 117/161] ugrep: 3.9.0 -> 3.9.1 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index cad0f96998cf..42711a2c5913 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9tHSdO9VlsbLqFFA/CKhbPvstU3+26jBaBw/tX5qJnw="; + sha256 = "sha256-KDAuGFoUJxaa0noW739+gxeHKZeouu14EDla0lWwaIQ="; }; buildInputs = [ From e066019096f11ab84b304e2f1e262f692385294e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 17 Jul 2022 16:30:18 +0800 Subject: [PATCH 118/161] hydra_unstable: 2022-06-30 -> 2022-08-08 --- pkgs/development/tools/misc/hydra/unstable.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index b6c4d6fb1c85..33a150be3460 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -84,6 +84,7 @@ let DigestSHA1 EmailMIME EmailSender + FileLibMagic FileSlurper FileWhich IOCompress @@ -126,13 +127,13 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2022-06-30"; + version = "2022-08-08"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "f2f82b3eeed652e7fc076adf6dcd5a72baaaed18"; - sha256 = "sha256-WPcwFX3q0Y0uMLVN853Xvn3e7RnOOHt8yTLbOBzz5oE="; + rev = "2b1c1e65d5fbbe25625a31ee93cb14c9a9edf969"; + sha256 = "sha256-mjCdJPB4t5OLGZ0r5usJTVs1BBr4cWeGGE7imyUfQnQ="; }; patches = [ From f1660d80277fda710668edff8ec5ab05c91422d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 06:38:53 +0000 Subject: [PATCH 119/161] aliyun-cli: 3.0.123 -> 3.0.124 --- pkgs/tools/admin/aliyun-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index b18b8a82088e..99f77ed14a54 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.123"; + version = "3.0.124"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-68u31s7SsRRT9OQpTqlhAs5Dx+ggbTTSeKYBByiqn6g="; + sha256 = "sha256-OorDK2/i0VjBy3lFuQGr5kmWvssGkBBSNlJEfGUbaxc="; }; vendorSha256 = "sha256-X5r89aI7UdVlzEJi8zaOzwTETwb+XH8dKO6rVe//FNs="; From 3ddd0f9002d8630a34a86cc30196a963d0b2c545 Mon Sep 17 00:00:00 2001 From: Mon Aaraj Date: Mon, 8 Aug 2022 17:32:48 +0300 Subject: [PATCH 120/161] maintainers: add monaaraj --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 479f32523969..8ef00b74cc26 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8818,6 +8818,13 @@ fingerprint = "1248 D3E1 1D11 4A85 75C9 8934 6794 D45A 488C 2EDE"; }]; }; + monaaraj = { + name = "Mon Aaraj"; + email = "owo69uwu69@gmail.com"; + matrix = "@mon:tchncs.de"; + github = "MonAaraj"; + githubId = 46468162; + }; monsieurp = { email = "monsieurp@gentoo.org"; github = "monsieurp"; From 9f1da18a1e9c48d43854811362b75236b61164cc Mon Sep 17 00:00:00 2001 From: Mon Aaraj Date: Mon, 8 Aug 2022 03:51:48 +0300 Subject: [PATCH 121/161] colemak-dh: init at unstable-2022-08-07 --- pkgs/data/misc/colemak-dh/default.nix | 37 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/data/misc/colemak-dh/default.nix diff --git a/pkgs/data/misc/colemak-dh/default.nix b/pkgs/data/misc/colemak-dh/default.nix new file mode 100644 index 000000000000..f36832ff42d8 --- /dev/null +++ b/pkgs/data/misc/colemak-dh/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "colemak-dh"; + version = "unstable-2022-08-07"; + + src = fetchFromGitHub { + owner = "ColemakMods"; + repo = "mod-dh"; + rev = "e846a5bd24d59ed15ba70b3a9d5363a38ca51d09"; + sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks="; + sparseCheckout = "console"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/keymaps/i386/ + gzip -r ./console + cp -r ./console $out/share/keymaps/i386/colemak + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://colemakmods.github.io/mod-dh"; + description = "A Colemak mod for more comfortable typing"; + license = licenses.publicDomain; + platforms = platforms.linux; + maintainers = with maintainers; [ monaaraj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac08ea8a357..49e80f87a12f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -368,6 +368,8 @@ with pkgs; conftest = callPackage ../development/tools/conftest { }; + colemak-dh = callPackage ../data/misc/colemak-dh { }; + colmena = callPackage ../tools/admin/colmena { }; colorz = callPackage ../tools/misc/colorz { }; From 243053e521dc90b825a17bf5ee9f5dfe7f56af84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 12 Aug 2022 11:25:56 +0000 Subject: [PATCH 122/161] python310Packages.mistune: 0.8.4 -> 2.0.4 Remove mistune_0_8 because it's insecure. --- nixos/lib/make-options-doc/default.nix | 2 +- .../python-modules/m2r/default.nix | 2 + .../python-modules/md2gemini/default.nix | 4 +- .../python-modules/mistune/common.nix | 27 ------------- .../python-modules/mistune/default.nix | 39 +++++++++++++------ .../python-modules/mrkd/default.nix | 2 + pkgs/misc/present/default.nix | 2 +- pkgs/servers/mail/mailman/hyperkitty.nix | 2 +- pkgs/tools/admin/iredis/default.nix | 5 +-- pkgs/top-level/python-aliases.nix | 2 + pkgs/top-level/python-packages.nix | 6 +-- 11 files changed, 41 insertions(+), 52 deletions(-) delete mode 100644 pkgs/development/python-modules/mistune/common.nix diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 6649fc41d41a..3f98e2cf87b8 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -123,7 +123,7 @@ in rec { inherit self; includeSiteCustomize = true; }); - in self.withPackages (p: [ p.mistune_2_0 ])) + in self.withPackages (p: [ p.mistune ])) ]; options = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix)); diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index b3077edcc5d4..fa9fdbe91bde 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -39,5 +39,7 @@ buildPythonPackage rec { description = "Markdown to reStructuredText converter"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + # https://github.com/miyakogi/m2r/issues/66 + broken = versionAtLeast mistune.version "2"; }; } diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index 5d7b53f77a44..bc4e4fc4b2c6 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, mistune_2_0, cjkwrap, wcwidth +{ lib, buildPythonPackage, fetchPypi, mistune, cjkwrap, wcwidth , pytestCheckHook }: buildPythonPackage rec { pname = "md2gemini"; version = "1.9.0"; - propagatedBuildInputs = [ mistune_2_0 cjkwrap wcwidth ]; + propagatedBuildInputs = [ mistune cjkwrap wcwidth ]; checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "md2gemini" ]; diff --git a/pkgs/development/python-modules/mistune/common.nix b/pkgs/development/python-modules/mistune/common.nix deleted file mode 100644 index 24508372d9a4..000000000000 --- a/pkgs/development/python-modules/mistune/common.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, version -, sha256 -, format ? "setuptools" -, extraMeta ? {} -}: - -buildPythonPackage rec { - inherit version format; - pname = "mistune"; - - src = fetchPypi { - inherit pname version sha256; - }; - - buildInputs = [ nose ]; - pythonImportsCheck = [ "mistune" ]; - - meta = with lib; { - description = "The fastest markdown parser in pure Python"; - homepage = "https://github.com/lepture/mistune"; - license = licenses.bsd3; - } // extraMeta; -} diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 515844443f12..16a5e22ac6a4 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -1,15 +1,30 @@ -self: rec { - mistune_0_8 = self.callPackage ./common.nix { - version = "0.8.4"; - sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e"; - extraMeta = { - knownVulnerabilities = [ "CVE-2022-34749" ]; - }; +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mistune"; + version = "2.0.4"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808"; }; - mistune_2_0 = self.callPackage ./common.nix { - version = "2.0.4"; - sha256 = "sha256-nuCmYFPiJnq6dyxx4GiR+o8a9tSwHV6E4me0Vw1NmAg="; - format = "pyproject"; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "mistune" ]; + + meta = with lib; { + description = "A sane Markdown parser with useful plugins and renderers"; + homepage = "https://github.com/lepture/mistune"; + license = licenses.bsd3; + maintainers = with maintainers; [ dotlambda ]; }; - mistune = mistune_0_8; } diff --git a/pkgs/development/python-modules/mrkd/default.nix b/pkgs/development/python-modules/mrkd/default.nix index 22cd93910d6b..0d97a91a16f3 100644 --- a/pkgs/development/python-modules/mrkd/default.nix +++ b/pkgs/development/python-modules/mrkd/default.nix @@ -24,5 +24,7 @@ buildPythonPackage rec { description = "Write man pages using Markdown, and convert them to Roff or HTML"; homepage = "https://github.com/refi64/mrkd"; license = licenses.bsd2; + # https://github.com/refi64/mrkd/pull/6 + broken = versionAtLeast mistune.version "2"; }; } diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix index 6eb489e1f8bd..0bd24f9ce197 100644 --- a/pkgs/misc/present/default.nix +++ b/pkgs/misc/present/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { pyyaml pyfiglet asciimatics - mistune_2_0 + mistune ]; pythonImportsCheck = [ "present" ]; diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 406e104e881c..7f221617878c 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { django-extensions djangorestframework flufl_lock - mistune_2_0 + mistune networkx psycopg2 python-dateutil diff --git a/pkgs/tools/admin/iredis/default.nix b/pkgs/tools/admin/iredis/default.nix index a48d2eeb0235..7e2db982cf9f 100644 --- a/pkgs/tools/admin/iredis/default.nix +++ b/pkgs/tools/admin/iredis/default.nix @@ -15,8 +15,7 @@ buildPythonApplication rec { substituteInPlace setup.py \ --replace "click>=7.0,<8.0" "click" \ --replace "wcwidth==0.1.9" "wcwidth" \ - --replace "redis>=3.4.0,<4.0.0" "redis" \ - --replace "mistune>=2.0,<3.0" "mistune" + --replace "redis>=3.4.0,<4.0.0" "redis" ''; propagatedBuildInputs = [ @@ -24,7 +23,7 @@ buildPythonApplication rec { click configobj importlib-resources - mistune_2_0 + mistune packaging pendulum prompt-toolkit diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fd546e026b56..68c1ac090161 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -103,6 +103,8 @@ mapAliases ({ mailman = throw "Please use pkgs.mailman"; # added 2022-04-29 mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29 mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 + mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 + mistune_2_0 = mistune; # added 2022-08-12 net2grid = gridnet; # add 2022-04-22 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e144fb406536..e07c8e0a1bd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5574,11 +5574,7 @@ in { mistletoe = callPackage ../development/python-modules/mistletoe { }; - inherit (import ../development/python-modules/mistune self) - mistune - mistune_0_8 - mistune_2_0 - ; + mistune = callPackage ../development/python-modules/mistune { }; mitmproxy = callPackage ../development/python-modules/mitmproxy { }; From eb642f80f9aecc19312909e08601a3c2020b5ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 12 Aug 2022 11:37:14 +0000 Subject: [PATCH 123/161] m2r: use toPythonApplication --- .../python-modules/m2r/default.nix | 2 +- pkgs/tools/text/m2r/default.nix | 32 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 pkgs/tools/text/m2r/default.nix diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index fa9fdbe91bde..d85c2196e843 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { homepage = "https://github.com/miyakogi/m2r"; description = "Markdown to reStructuredText converter"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ AndersonTorres SuperSandro2000 ]; # https://github.com/miyakogi/m2r/issues/66 broken = versionAtLeast mistune.version "2"; }; diff --git a/pkgs/tools/text/m2r/default.nix b/pkgs/tools/text/m2r/default.nix deleted file mode 100644 index f6dda712d0b9..000000000000 --- a/pkgs/tools/text/m2r/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, docutils -, mistune -, pygments -}: - -buildPythonApplication rec { - pname = "m2r"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "miyakogi"; - repo = pname; - rev = "v${version}"; - hash = "sha256-JNLPEXMoiISh4RnKP+Afj9/PJp9Lrx9UYHsfuGAL7uI="; - }; - - buildInputs = [ - docutils - mistune - pygments - ]; - - meta = with lib; { - homepage = "https://github.com/miyakogi/m2r"; - description = "Markdown-to-RestructuredText converter"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49e80f87a12f..748bcbdcffe5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8076,7 +8076,7 @@ with pkgs; mcfly = callPackage ../tools/misc/mcfly { }; - m2r = python3Packages.callPackage ../tools/text/m2r { }; + m2r = with python3Packages; toPythonApplication m2r; md2gemini = with python3.pkgs; toPythonApplication md2gemini; From 88132767ceb5cfdde740a25e4d0f7ce933f588b1 Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 14 Aug 2022 22:38:35 -0400 Subject: [PATCH 124/161] git: actually add fetchgit tests to passthru.tests Nested attrsets don't get built when running `nix-build -A git.tests`, so we use the update operator to add the attributes from `tests.fetchgit` to `passthru.tests`. --- .../version-management/git-and-tools/git/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 9cab44840d4a..3fd055e7148c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -375,8 +375,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; }); buildbot-integration = nixosTests.buildbot; - inherit (tests) fetchgit; - }; + } // tests.fetchgit; }; meta = { From 7e44c3c38268ced3292a58f5f43d8aefc9ec6f21 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Aug 2022 11:47:10 +0200 Subject: [PATCH 125/161] python310Packages.bluetooth-sensor-state-data: 1.5.0 -> 1.6.0 --- .../python-modules/bluetooth-sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index 72edd0e6ca38..a511e23cd945 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; - version = "1.5.0"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-Xr9MCTcEnO5bMk9AdBTwBCXwm33UUTP7FYZyjDYrMNA="; + hash = "sha256-Btfya9l1UX7GbiUxuaFHT0l+pG+Dg5X0L2JS+1/VYOo="; }; nativeBuildInputs = [ From 77331374d3ee76e013e61ac1857ab28314eb9288 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Aug 2022 11:50:46 +0200 Subject: [PATCH 126/161] python310Packages.sensorpush-ble: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/sensorpush-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index 80fcbfa17694..00a01dc0df9a 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sensorpush-ble"; - version = "1.5.1"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-2Q56fXMgw1Al3l6WKI1cdGXfLmZ1qkidkoWKmvEXRaI="; + hash = "sha256-64DywtZwfDFjW8WUzw3ZTT462sBGFgAHGc0bGnKCJpY="; }; nativeBuildInputs = [ From 7001e052e99e35e8d77272a361d3045402f167ce Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 15 Aug 2022 11:53:53 +0200 Subject: [PATCH 127/161] ioccheck: fix build --- pkgs/tools/security/ioccheck/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/tools/security/ioccheck/default.nix index 8dd833f9d28f..439567ecb038 100644 --- a/pkgs/tools/security/ioccheck/default.nix +++ b/pkgs/tools/security/ioccheck/default.nix @@ -74,7 +74,8 @@ buildPythonApplication rec { # Can be removed with the next release substituteInPlace pyproject.toml \ --replace '"hurry.filesize" = "^0.9"' "" \ - --replace 'vt-py = ">=0.6.1,<0.8.0"' 'vt-py = ">=0.6.1"' + --replace 'vt-py = ">=0.6.1,<0.8.0"' 'vt-py = ">=0.6.1"' \ + --replace 'backoff = "^1.10.0"' 'backoff = ">=1.10.0"' ''; pythonImportsCheck = [ From b75502a971f9ba28d1347990eb1f12636c54344d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 15 Aug 2022 12:10:34 +0200 Subject: [PATCH 128/161] maigret: ignore DeprecationWarning --- pkgs/tools/security/maigret/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/tools/security/maigret/default.nix index 5fe281017b55..05ea8dcf3df8 100644 --- a/pkgs/tools/security/maigret/default.nix +++ b/pkgs/tools/security/maigret/default.nix @@ -63,12 +63,17 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # Remove all version pinning sed -i -e "s/==[0-9.]*//" requirements.txt + # We are not build for Python < 3.7 - sed -i -e '/future-annotations/d' requirements.txt - # We can't work with dummy packages - sed -i -e 's/bs4/beautifulsoup4/g' requirements.txt + substituteInPlace requirements.txt \ + --replace "future-annotations" "" ''; + pytestFlagsArray = [ + # DeprecationWarning: There is no current event loop + "-W ignore::DeprecationWarning" + ]; + disabledTests = [ # Tests require network access "test_extract_ids_from_page" From 47b3196aabdf11b43dafb35960f88885beb825e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Aug 2022 13:06:43 +0200 Subject: [PATCH 129/161] python3Packages.flask-appbuilder: fix build Apparently during the last python-updates run we mixed up the hashes of the src and the patch file, breaking the package build. --- .../python-modules/flask-appbuilder/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index e52ecfc6493d..2ef78ecf8d45 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-g+iHUL83PokXPGu7HJ8ffLocQr0uGpMqS5MbfIlZZ2E="; + hash = "sha256-8NaTr0RcnsVik/AB4g8QL+FkcRlgkkASFe8fXIvFt/A="; }; patches = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { # https://github.com/dpgaspar/Flask-AppBuilder/pull/1734 name = "flask-appbuilder-wtf3.patch"; url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/bccb3d719cd3ceb872fe74a9ab304d74664fbf43.patch"; - sha256 = "sha256-8NaTr0RcnsVik/AB4g8QL+FkcRlgkkASFe8fXIvFt/A="; + hash = "sha256-24mlS3HIs77wKOlwdHah5oks31OOmCBHmcafZT2ITOc="; excludes = [ "requirements.txt" "setup.py" @@ -78,8 +78,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3" \ - --replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3" \ - --replace "Flask-WTF>=0.14.2, <0.15.0" "Flask-WTF" \ + --replace "Flask-WTF>=0.14.2, <1.0.0" "Flask-WTF" \ --replace "WTForms<3.0.0" "WTForms" \ --replace "marshmallow-sqlalchemy>=0.22.0, <0.27.0" "marshmallow-sqlalchemy" \ --replace "prison>=0.2.1, <1.0.0" "prison" From 342d67be61a28c840c945875908dcedeebd74bec Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 15 Aug 2022 12:33:31 +0100 Subject: [PATCH 130/161] obs-studio: resolve failed wrapping if a plugin has no data path fixes a regression due to #186548 where the symlinkJoin fails when a package does not have that path such as `obs-studio-plugins.wlrobs` Only one `symlinkJoin` is necessary --- pkgs/applications/video/obs-studio/wrapper.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix index 3b98385a869e..28efefbd0042 100644 --- a/pkgs/applications/video/obs-studio/wrapper.nix +++ b/pkgs/applications/video/obs-studio/wrapper.nix @@ -16,19 +16,14 @@ symlinkJoin { pluginsJoined = symlinkJoin { name = "obs-studio-plugins"; - paths = lists.map (plugin: "${plugin}/lib/obs-plugins") plugins; - }; - - pluginsDataJoined = symlinkJoin { - name = "obs-studio-plugins-data"; - paths = lists.map (plugin: "${plugin}/share/obs/obs-plugins") plugins; + paths = plugins; }; wrapCommand = [ "wrapProgram" "$out/bin/obs" - ''--set OBS_PLUGINS_PATH "${pluginsJoined}"'' - ''--set OBS_PLUGINS_DATA_PATH "${pluginsDataJoined}"'' + ''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"'' + ''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"'' ] ++ pluginArguments; in concatStringsSep " " wrapCommand; From 9c69f307ce6e869b5ff43c242b7cf6d5f5fd9013 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 19:35:43 +0800 Subject: [PATCH 131/161] nixos/cinnamon: install gnome-screenshot Closes #169178 --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 5a7d9e28b5c7..26a5191761d6 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -212,6 +212,7 @@ in # external apps shipped with linux-mint hexchat gnome-calculator + gnome-screenshot ] config.environment.cinnamon.excludePackages; }) ]; From ff1dce127b2a2f98beeeb81199e649f18a48ff37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 11:51:44 +0000 Subject: [PATCH 132/161] monolith: 2.6.1 -> 2.6.2 --- pkgs/tools/backup/monolith/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index bc31d5dfd361..a68ef7512ae4 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JhQkoVGJpMesNz2hRe+kWNX4zYrIcKzT0Z6owrXlRN4="; + sha256 = "sha256-E+2D/oidqxRqKR70LN4uR1QkBa4oFfLiS8SoJkrgwtI="; }; - cargoSha256 = "sha256-BikzJr50Aua9llyQgbP/paIoC7dvsG0RYyVXmbdeGIA="; + cargoSha256 = "sha256-Acmo0p+WihRg3dU3ptaFw6uf9OQegvPUCQ63b5Ucdmk="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] From 1e00dcc8f03d18ceb5abda3380befa7efca74dad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 11:53:11 +0000 Subject: [PATCH 133/161] mozjpeg: 4.0.3 -> 4.1.1 --- pkgs/applications/graphics/mozjpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 0c1933ad6129..1a2e9a4449c8 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libpng, zlib, nasm }: stdenv.mkDerivation rec { - version = "4.0.3"; + version = "4.1.1"; pname = "mozjpeg"; src = fetchFromGitHub { owner = "mozilla"; repo = "mozjpeg"; rev = "v${version}"; - sha256 = "1wb2ys0yjy6hgpb9qvzjxs7sb2zzs44p6xf7n026mx5nx85hjbyv"; + sha256 = "sha256-tHiuQeBWjyXxy5F8jadYz5qfF2S3snagnlCPjI1Cj18="; }; cmakeFlags = [ "-DENABLE_STATIC=NO" "-DPNG_SUPPORTED=TRUE" ]; # See https://github.com/mozilla/mozjpeg/issues/351 From 07a564964c0dfb1fa15f9be701b2fba55b252a9d Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 14 Aug 2022 12:40:39 -0700 Subject: [PATCH 134/161] git-team: fix build on aarch64-darwin Upstream has dependency updates that fix this build with Go 1.18 on aarch64-darwin but is not close to cutting a new release, so we can instead pull in a minimal set of patches to fix this. --- .../git-and-tools/git-team/default.nix | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-team/default.nix b/pkgs/applications/version-management/git-and-tools/git-team/default.nix index 3fac0dc9791b..6ec4589f570e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-team/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-team/default.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +, installShellFiles +}: + buildGoModule rec { pname = "git-team"; version = "1.7.0"; @@ -7,10 +13,28 @@ buildGoModule rec { owner = "hekmekk"; repo = "git-team"; rev = "v${version}"; - sha256 = "0nl5j64b61jw4bkf29y51svjbndmqqrqx96yaip4vjzj2dx9ywm4"; + hash = "sha256-pHKfehPyy01uVN6kjjPGtdkltw7FJ+HmIlwGs4iRhVo="; }; - vendorSha256 = "sha256-xJMWPDuqoNtCCUnKuUvwlYztyrej1uZttC0NsDvYnXI="; + patches = [ + (fetchpatch { + name = "1-update-dependencies-for-go-1.18.patch"; + url = "https://github.com/hekmekk/git-team/commit/d8632d9938379293521f9b3f2a93df680dd13a31.patch"; + hash = "sha256-hlmjPf3qp8WPNSH+GgkqATDiKIRzo+t81Npkptw8vgI="; + }) + (fetchpatch { + name = "2-update-dependencies-for-go-1.18.patch"; + url = "https://github.com/hekmekk/git-team/commit/f6acc96c2ffe76c527f2f2897b368cbb631d738c.patch"; + hash = "sha256-Pe+UAK9N1NpXhFGYv9l1iZ1/fCCqnT8OSgKdt/vUqO4="; + }) + (fetchpatch { + name = "3-update-dependencies-for-go-1.18.patch"; + url = "https://github.com/hekmekk/git-team/commit/2f38137298e4749a8dfe37e085015360949e73ad.patch"; + hash = "sha256-+6C8jp/qwYVmbL+SpV9FJIVyBRvX4tXBcoHMB//nNTk="; + }) + ]; + + vendorSha256 = "sha256-GdwksPmYEGTq/FkG/rvn3o0zMKU1cSkpgZ+GrfVgLWM="; nativeBuildInputs = [ installShellFiles ]; From 27e6c7477b4069023c00518cb939dbfd5d7edfeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 15 Aug 2022 14:38:19 +0200 Subject: [PATCH 135/161] neovide: 0.10.0 -> 0.10.1 --- .../editors/neovim/neovide/Cargo.lock.patch | 13 ------------- .../applications/editors/neovim/neovide/default.nix | 10 +++------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 pkgs/applications/editors/neovim/neovide/Cargo.lock.patch diff --git a/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch b/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch deleted file mode 100644 index ebf56a64e4a1..000000000000 --- a/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index f86b4b4..befc2bf 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1326,7 +1326,7 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" - - [[package]] - name = "neovide" --version = "0.9.0" -+version = "0.10.0" - dependencies = [ - "async-trait", - "cfg-if 1.0.0", diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index f74fcc937c1f..d806e6e7d56e 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,20 +25,16 @@ }: rustPlatform.buildRustPackage rec { pname = "neovide"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Kethku"; repo = "neovide"; rev = version; - sha256 = "sha256-4oZJZd5Allh9Wc7YOvW9sF+38Sm15dL03TJZkHTbXXc="; - postFetch = '' - cd $out - patch -p1 -i ${./Cargo.lock.patch} - ''; + sha256 = "sha256-PViSiK6+H79MLIOFe26cNqUZ6gZdqDC/S+ksTrbOm54="; }; - cargoSha256 = "sha256-E1Wp5tPVK+5WIQ+3OrzY3W9Vfy57DHgNccKtIp/vUy8="; + cargoSha256 = "sha256-GvueDUY4Hzfih/MyEfhdz/QNVd9atTC8SCF+PyuJJic="; SKIA_SOURCE_DIR = let From a29ca0ec205210ff208c5f00d6a5b9d3413f4287 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 20:23:32 +0800 Subject: [PATCH 136/161] cinnamon.cinnamon-common: fix msgfmt path for Spices.py Closes #168924 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index d1db0f8a25ec..efe46904ff96 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -11,6 +11,7 @@ , fetchFromGitHub , fetchpatch , gdk-pixbuf +, gettext , libgnomekbd , glib , gobject-introspection @@ -178,6 +179,8 @@ stdenv.mkDerivation rec { sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d sed "s|/usr/bin|$out/bin|g" -i ./files/usr/share/xsessions/cinnamon.desktop ./files/usr/share/xsessions/cinnamon2d.desktop + sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py + patchShebangs src/data-to-c.pl ''; From 37ef4030062204ca0ba1bfd316f18d773aacc789 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 14 Aug 2022 05:56:14 -0400 Subject: [PATCH 137/161] python3Packages.ibis-framework: 3.0.2 -> 3.1.0 --- .../python-modules/ibis-framework/default.nix | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 2572903791d2..3638ee3d3e48 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -5,7 +5,6 @@ , pythonOlder , pytestCheckHook , atpublic -, cached-property , click , clickhouse-cityhash , clickhouse-driver @@ -13,10 +12,10 @@ , datafusion , duckdb , duckdb-engine +, filelock , geoalchemy2 , geopandas , graphviz-nox -, importlib-metadata , lz4 , multipledispatch , numpy @@ -37,6 +36,7 @@ , python , pytz , regex +, rsync , shapely , sqlalchemy , sqlite @@ -55,14 +55,14 @@ let ibisTestingData = fetchFromGitHub { owner = "ibis-project"; repo = "testing-data"; - rev = "a88a4b3c3b54a88e7f77e59de70f5bf20fb62f19"; - sha256 = "sha256-BnRhVwPcWFwiBJ2ySgiiuUdnF4gesnTq1/dLcuvc868="; + rev = "3c39abfdb4b284140ff481e8f9fbb128b35f157a"; + sha256 = "sha256-BZWi4kEumZemQeYoAtlUSw922p+R6opSWp/bmX0DjAo="; }; in buildPythonPackage rec { pname = "ibis-framework"; - version = "3.0.2"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -71,14 +71,15 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = version; - hash = "sha256-7ywDMAHQAl39kiHfxVkq7voUEKqbb9Zq8qlaug7+ukI="; + hash = "sha256-/mQWQLiJa1DRZiyiA6F0/lMyn3wSY1IUwJl2S0IFkvs="; }; patches = [ (fetchpatch { - url = "https://github.com/ibis-project/ibis/commit/a6f64c6c32b49098d39bb205952cbce4bdfea657.patch"; - sha256 = "sha256-puVMjiJXWk8C9yhuXPD9HKrgUBYcYmUPacQz5YO5xYQ="; - includes = [ "pyproject.toml" ]; + name = "xfail-datafusion-0.4.0"; + url = "https://github.com/ibis-project/ibis/compare/c162abba4df24e0d531bd2e6a3be3109c16b43b9...6219d6caee19b6fd3171983c49cd8d6872e3564b.patch"; + hash = "sha256-pCYPntj+TwzqCtYWRf6JF5/tJC4crSXHp0aepRocHck="; + excludes = ["poetry.lock"]; }) ]; @@ -86,8 +87,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ atpublic - cached-property - importlib-metadata multipledispatch numpy packaging @@ -104,14 +103,17 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook click + filelock pytest-benchmark pytest-mock pytest-randomly pytest-xdist + rsync ] ++ lib.concatMap (name: passthru.optional-dependencies.${name}) testBackends; preBuild = '' # setup.py exists only for developer convenience and is automatically generated + # it gets in the way in nixpkgs so we remove it rm setup.py ''; @@ -119,6 +121,10 @@ buildPythonPackage rec { "--dist=loadgroup" "-m" "'${lib.concatStringsSep " or " testBackends} or core'" + # this test fails on nixpkgs datafusion version (0.4.0), but works on + # datafusion 0.6.0 + "-k" + "'not datafusion-no_op'" ]; preCheck = '' @@ -127,16 +133,8 @@ buildPythonPackage rec { export IBIS_TEST_DATA_DIRECTORY IBIS_TEST_DATA_DIRECTORY="$(mktemp -d)" - # copy the test data to a writable directory - cp -r ${ibisTestingData}/* "$IBIS_TEST_DATA_DIRECTORY" - - find "$IBIS_TEST_DATA_DIRECTORY" -type d -exec chmod u+rwx {} + - find "$IBIS_TEST_DATA_DIRECTORY" -type f -exec chmod u+rw {} + - - # load data - for backend in ${lib.concatStringsSep " " testBackends}; do - ${python.interpreter} ci/datamgr.py load "$backend" - done + # copy the test data to a directory + rsync --chmod=Du+rwx,Fu+rw --archive "${ibisTestingData}/" "$IBIS_TEST_DATA_DIRECTORY" ''; postCheck = '' From 8f72f03e07173fcdfad861e67c2fc6e19873d76b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 15:46:19 +0000 Subject: [PATCH 138/161] werf: 1.2.153 -> 1.2.154 --- pkgs/applications/networking/cluster/werf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 61a89f959040..c632df6396be 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.153"; + version = "1.2.154"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-BdGeafZvMgH6qRyYrFPQp0r2470me755J6gUK9XkIJQ="; + sha256 = "sha256-5tiJRxE8W2nvkQdJ3jL8P0+7LXEfNOdL15LdDjlDWpc="; }; vendorSha256 = "sha256-XpSAFiweD2oUKleD6ztDp1+3PpfUWXfGaaE/9mzRrUQ="; From 4fb53a5647b71266107020d6a9cdb84e01d87ff0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 02:44:16 +0000 Subject: [PATCH 139/161] python310Packages.iminuit: 2.13.0 -> 2.15.2 --- pkgs/development/python-modules/iminuit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index f0b744bfbcaf..386bd1961208 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.13.0"; + version = "2.15.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-40eFwqLArqb/hmcv6BuAoErJ1Cp57YJJYw8lKaj2oPo="; + hash = "sha256-YKx9L+lAXJIGZ1IpJz9AFhHT9d+iKUJUFkbEYltZ8eo="; }; nativeBuildInputs = [ From 3b1f5eab31b33fb1621ba7823317990951bf45e6 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Mon, 15 Aug 2022 12:47:27 -0400 Subject: [PATCH 140/161] firefox: add application actions to .desktop file --- .../networking/browsers/firefox/wrapper.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 1b8e3c879676..35a98e6c8c60 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -86,6 +86,8 @@ let ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk3 ]; + launcherName = "${applicationName}${nameSuffix}"; + ######################### # # # EXTRA PREF CHANGES # @@ -167,7 +169,7 @@ let desktopItem = makeDesktopItem { name = applicationName; - exec = "${applicationName}${nameSuffix} %U"; + exec = "${launcherName} %U"; inherit icon; desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; genericName = "Web Browser"; @@ -182,6 +184,20 @@ let "x-scheme-handler/ftp" ]; startupWMClass = wmClass; + actions = { + new-window = { + name = "New Window"; + exec = "${launcherName} --new-window %U"; + }; + new-private-window = { + name = "New Private Window"; + exec = "${launcherName} --private-window %U"; + }; + profile-manager-window = { + name = "Profile Manager"; + exec = "${launcherName} --ProfileManger"; + }; + }; }; nativeBuildInputs = [ makeWrapper lndir jq ]; @@ -261,7 +277,7 @@ let --suffix-each GTK_PATH ':' "$gtk_modules" \ --prefix PATH ':' "${xdg-utils}/bin" \ --suffix PATH ':' "$out/bin" \ - --set MOZ_APP_LAUNCHER "${applicationName}${nameSuffix}" \ + --set MOZ_APP_LAUNCHER "${launcherName}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ From 50500713c37b40c570cd6a8cefcda713d5e43688 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 16:47:39 +0000 Subject: [PATCH 141/161] python310Packages.flask-jwt-extended: 4.4.2 -> 4.4.4 --- .../development/python-modules/flask-jwt-extended/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 4beac84ccefc..3764cc36cb0f 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flask-jwt-extended"; - version = "4.4.2"; + version = "4.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-JWT-Extended"; inherit version; - hash = "sha256-9YK7qYD89yirclDbtvvcqNTgdOJOspFbARhDdv//mMc="; + hash = "sha256-YrUh11SUwpCmRq6KzHcSNyHkNkeQ8eZK8AONgjlh+/A="; }; propagatedBuildInputs = [ From dbf97a4f55844aab09ec0fb5f0ae315611ee3fe4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Aug 2022 10:02:05 -0700 Subject: [PATCH 142/161] kubelogin-oidc: 1.25.1 -> 1.25.2 (#186641) --- .../networking/cluster/kubelogin-oidc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index 953a202170a5..7f8b3b443430 100644 --- a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.25.1"; + version = "1.25.2"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BKJ6dZMGW+Md+YUEEgWtPdfiFiOP5Nfb+awx8FXB+bM="; + sha256 = "sha256-d3iiUmNEPKylYSFq9cSfgJuQYLPhBJavGV8tOao0l4s="; }; subPackages = ["."]; - vendorSha256 = "sha256-mu4NHeYZBM4C5qpj2wRTLsRNLDvZGNkppKGDw621mp4="; + vendorSha256 = "sha256-XxVXhNWZOyvrdh2yPQogtH62h7d8NbsNhhrwGuqcLJs="; # Rename the binary instead of symlinking to avoid conflict with the # Azure version of kubelogin From 73216024d1669bedfd5e41371ead35ec97c043a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Aug 2022 10:02:47 -0700 Subject: [PATCH 143/161] dex-oidc: 2.32.0 -> 2.33.0 (#186589) --- pkgs/servers/dex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index ed5a0be8913c..71c9bafbf7cb 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dex"; - version = "2.32.0"; + version = "2.33.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7nuolUA4U99o+bM/pwwd2Q4GPpyxu8TpYRKkCK+b1aI="; + sha256 = "sha256-sl/OdwSkN4uEtuIyYtR5xjxy1z7B6rmG2Cf7xWz0Kp0="; }; - vendorSha256 = "sha256-LXZ/QL2+Ty9oq4BXXWceO3+uyY1EOeU5jqVcakSaE94="; + vendorSha256 = "sha256-9zjQBgAuphtvpbs9kzFmrgto6KvNh1N4GdRDk3wIBGY="; subPackages = [ "cmd/dex" From 65542a6348b50d62198a1a992723cdd6dbaaa137 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 19 Jul 2022 13:00:15 +0200 Subject: [PATCH 144/161] nixos/github-runner: use state instead of runtime dir as `RUNNER_ROOT` Using the runtime directory as `RUNNER_ROOT` is wrong. We should always use the state directory like we already do when invoking the runner configure script. Otherwise, the runner constructs the wrong path for some files (.credentials, .runner, ...). --- .../modules/services/continuous-integration/github-runner.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index 540033823687..788457d68b90 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -136,7 +136,7 @@ in environment = { HOME = runtimeDir; - RUNNER_ROOT = runtimeDir; + RUNNER_ROOT = stateDir; }; path = (with pkgs; [ @@ -213,7 +213,7 @@ in echo "Configuring GitHub Actions Runner" token=$(< "$STATE_DIRECTORY"/${newConfigTokenFilename}) - RUNNER_ROOT="$STATE_DIRECTORY" ${cfg.package}/bin/config.sh \ + ${cfg.package}/bin/config.sh \ --unattended \ --disableupdate \ --work "$RUNTIME_DIRECTORY" \ From 3f075e5bb1ea2e74923b43a2203123fbd1514535 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 19 Jul 2022 13:13:50 +0200 Subject: [PATCH 145/161] nixos/github-runner: add PAT support This commit introduces support for runner registrations through a personal access token (PAT). To use a PAT instead of a registration token, place an appropriately scoped PAT in `tokenFile`. If the file contains a PAT, the configuration script queries a new runner registration token. Using a runner registration token directly continues to work as before. --- .../continuous-integration/github-runner.nix | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index 788457d68b90..d2b427c234d8 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -48,9 +48,14 @@ in tokenFile = mkOption { type = types.path; description = lib.mdDoc '' - The full path to a file which contains the runner registration token. + The full path to a file which contains either a runner registration token or a + personal access token (PAT). The file should contain exactly one line with the token without any newline. - The token can be used to re-register a runner of the same name but is time-limited. + If a registration token is given, it can be used to re-register a runner of the same + name but is time-limited. If the file contains a PAT, the service creates a new + registration token on startup as needed. Make sure the PAT has a scope of + `admin:org` for organization-wide registrations or a scope of + `repo` for a single repository. Changing this option or the file's content triggers a new runner registration. ''; @@ -212,17 +217,27 @@ in if [[ -e "$STATE_DIRECTORY/${newConfigTokenFilename}" ]]; then echo "Configuring GitHub Actions Runner" - token=$(< "$STATE_DIRECTORY"/${newConfigTokenFilename}) - ${cfg.package}/bin/config.sh \ - --unattended \ - --disableupdate \ - --work "$RUNTIME_DIRECTORY" \ - --url ${escapeShellArg cfg.url} \ - --token "$token" \ - --labels ${escapeShellArg (concatStringsSep "," cfg.extraLabels)} \ - --name ${escapeShellArg cfg.name} \ - ${optionalString cfg.replace "--replace"} \ + args=( + --unattended + --disableupdate + --work "$RUNTIME_DIRECTORY" + --url ${escapeShellArg cfg.url} + --labels ${escapeShellArg (concatStringsSep "," cfg.extraLabels)} + --name ${escapeShellArg cfg.name} + ${optionalString cfg.replace "--replace"} ${optionalString (cfg.runnerGroup != null) "--runnergroup ${escapeShellArg cfg.runnerGroup}"} + ) + + # If the token file contains a PAT (i.e., it starts with "ghp_"), we have to use the --pat option, + # if it is not a PAT, we assume it contains a registration token and use the --token option + token=$(<"$STATE_DIRECTORY/${newConfigTokenFilename}") + if [[ "$token" =~ ^ghp_* ]]; then + args+=(--pat "$token") + else + args+=(--token "$token") + fi + + ${cfg.package}/bin/config.sh "''${args[@]}" # Move the automatically created _diag dir to the logs dir mkdir -p "$STATE_DIRECTORY/_diag" From 987a4b42317a52426d25357bc98b5f97b4082cb2 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 20 Jul 2022 11:16:26 +0200 Subject: [PATCH 146/161] nixos/github-runner: add support for ephemeral runners Adds the module option `ephemeral`. If set to true, configures the runner registration with the `--ephemeral` option. This causes the runner to exit after processing a single job, to de-register itself, and to delete its configuration. Afterward, systemd restarts the service which triggers a new ephemeral registration with a clean state. --- .../continuous-integration/github-runner.nix | 48 +++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index d2b427c234d8..97ad23431ec2 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -122,6 +122,24 @@ in default = pkgs.github-runner; defaultText = literalExpression "pkgs.github-runner"; }; + + ephemeral = mkOption { + type = types.bool; + description = lib.mdDoc '' + If enabled, causes the following behavior: + + - Passes the `--ephemeral` flag to the runner configuration script + - De-registers and stops the runner with GitHub after it has processed one job + - On stop, systemd wipes the runtime directory (this always happens, even without using the ephemeral option) + - Restarts the service after its successful exit + - On start, wipes the state directory and configures a new runner + + You should only enable this option if `tokenFile` points to a file which contains a + personal access token (PAT). If you're using the option with a registration token, restarting the + service will fail as soon as the registration token expired. + ''; + default = false; + }; }; config = mkIf cfg.enable { @@ -183,7 +201,7 @@ in ${lines} ''; currentConfigPath = "$STATE_DIRECTORY/.nixos-current-config.json"; - runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" ] cfg; + runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" "ephemeral" ] cfg; newConfigPath = builtins.toFile "${svcName}-config.json" (builtins.toJSON runnerRegistrationConfig); newConfigTokenFilename = ".new-token"; runnerCredFiles = [ @@ -193,17 +211,24 @@ in ]; unconfigureRunner = writeScript "unconfigure" '' differs= - # Set `differs = 1` if current and new runner config differ or if `currentConfigPath` does not exist - ${pkgs.diffutils}/bin/diff -q '${newConfigPath}' "${currentConfigPath}" >/dev/null 2>&1 || differs=1 - # Also trigger a registration if the token content changed - ${pkgs.diffutils}/bin/diff -q \ - "$STATE_DIRECTORY"/${currentConfigTokenFilename} \ - ${escapeShellArg cfg.tokenFile} \ - >/dev/null 2>&1 || differs=1 + + if [[ "$(ls -A "$STATE_DIRECTORY")" ]]; then + # State directory is not empty + # Set `differs = 1` if current and new runner config differ or if `currentConfigPath` does not exist + ${pkgs.diffutils}/bin/diff -q '${newConfigPath}' "${currentConfigPath}" >/dev/null 2>&1 || differs=1 + # Also trigger a registration if the token content changed + ${pkgs.diffutils}/bin/diff -q \ + "$STATE_DIRECTORY"/${currentConfigTokenFilename} \ + ${escapeShellArg cfg.tokenFile} \ + >/dev/null 2>&1 || differs=1 + # If .credentials does not exist, assume a previous run de-registered the runner on stop (ephemeral mode) + [[ ! -f "$STATE_DIRECTORY/.credentials" ]] && differs=1 + fi if [[ -n "$differs" ]]; then echo "Config has changed, removing old runner state." - echo "The old runner will still appear in the GitHub Actions UI." \ + # In ephemeral mode, the runner deletes the `.credentials` file after de-registering it with GitHub + [[ -f "$STATE_DIRECTORY/.credentials" ]] && echo "The old runner will still appear in the GitHub Actions UI." \ "You have to remove it manually." find "$STATE_DIRECTORY/" -mindepth 1 -delete @@ -226,6 +251,7 @@ in --name ${escapeShellArg cfg.name} ${optionalString cfg.replace "--replace"} ${optionalString (cfg.runnerGroup != null) "--runnergroup ${escapeShellArg cfg.runnerGroup}"} + ${optionalString cfg.ephemeral "--ephemeral"} ) # If the token file contains a PAT (i.e., it starts with "ghp_"), we have to use the --pat option, @@ -265,6 +291,10 @@ in setupRuntimeDir ]; + # If running in ephemeral mode, restart the service on-exit (i.e., successful de-registration of the runner) + # to trigger a fresh registration. + Restart = if cfg.ephemeral then "on-success" else "no"; + # Contains _diag LogsDirectory = [ systemdDir ]; # Default RUNNER_ROOT which contains ephemeral Runner data From 006d9d2dfbc192257890f7d85c129f40b631b34f Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 20 Jul 2022 11:28:41 +0200 Subject: [PATCH 147/161] release-notes: add github-runner support for PAT and ephemeral --- .../manual/from_md/release-notes/rl-2211.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ 2 files changed, 12 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index b5c3df14e45a..b30bd7940aab 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -369,6 +369,16 @@ release notes for more details. + + + github-runner gained support for ephemeral + runners and registrations using a personal access token (PAT) + instead of a registration token. See + services.github-runner.ephemeral and + services.github-runner.tokenFile for + details. + + A new module was added for the Saleae Logic device family, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 1e37922f7b23..c248856a74e5 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -137,6 +137,8 @@ Use `configure.packages` instead. - The `xplr` package has been updated from 0.18.0 to 0.19.0, which brings some breaking changes. See the [upstream release notes](https://github.com/sayanarijit/xplr/releases/tag/v0.19.0) for more details. +- `github-runner` gained support for ephemeral runners and registrations using a personal access token (PAT) instead of a registration token. See `services.github-runner.ephemeral` and `services.github-runner.tokenFile` for details. + - A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`. - The Redis module now disables RDB persistence when `services.redis.servers..save = []` instead of using the Redis default. From 786f72c32e2a05528ae546ce48da2db2dc7facce Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 4 Aug 2022 14:06:25 +0200 Subject: [PATCH 148/161] nixos/github-runner: start `Runner.Listener` directly in `ExecStart=` The `runsvc.sh` script wraps a JavaScript script which starts `Runner.Listener` and also handles failures. This has the downside that the service _always_ exits with status code 0, i.e., success. This causes frequent service restarts when running in ephemeral mode with a faulty config as Systemd always sees a success exit status. To prevent this, this commit changes the service config to call `Runner.Listener` directly. The JavaScript wrapper stops the process with a SIGINT, hence, the Systemd unit now sends a SIGINT to stop the service. --- .../services/continuous-integration/github-runner.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index 97ad23431ec2..9abe13a89af1 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -173,7 +173,7 @@ in ] ++ cfg.extraPackages; serviceConfig = rec { - ExecStart = "${cfg.package}/bin/runsvc.sh"; + ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service"; # Does the following, sequentially: # - If the module configuration or the token has changed, purge the state directory, @@ -314,8 +314,7 @@ in # By default, use a dynamically allocated user DynamicUser = true; - KillMode = "process"; - KillSignal = "SIGTERM"; + KillSignal = "SIGINT"; # Hardening (may overlap with DynamicUser=) # The following options are only for optimizing: From 5e502ceb4f0c1e8f22e7f0ce0b24601f955ab842 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Aug 2022 19:23:03 +0200 Subject: [PATCH 149/161] theharvester: 4.0.3 -> 4.2.0 --- pkgs/tools/security/theharvester/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index 81bcd66948f3..a78d9a23c187 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "theharvester"; - version = "4.0.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "laramies"; repo = pname; rev = version; - sha256 = "sha256-Ckouhe/Uq6Dv9p/LRpPQkiKuYrwrl/Z7KkYYamDHav8="; + sha256 = "sha256-P3yp6COwyQnVDfZM198ygu+HLdisRw068aZOVSLl7r4="; }; propagatedBuildInputs = with python3.pkgs; [ From 212c683dee102fa3b56cacd0e0d8aa171bbc0b86 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 15 Aug 2022 19:25:05 +0200 Subject: [PATCH 150/161] jira-cli-go: 1.0.0 -> 1.1.0 --- pkgs/development/tools/jira-cli-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index e8f0b7896242..095bfefd0a6a 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jira-cli-go"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ankitpokhrel"; repo = "jira-cli"; rev = "v${version}"; - sha256 = "sha256-+WkeiB4vgKxlVNnd5cEMmE9EYcGAqrzIrLsvPAA1eOE="; + sha256 = "sha256-UpDaKg6TA1qCkbzF7BARtj+tAyuCCGAyqOdItZU64Ls="; }; vendorSha256 = "sha256-SpUggA9u8OGV2zF3EQ0CB8M6jpiVQi957UGaN+foEuk="; From 99bc6920c216d97434ba358395f20d0512cc936b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 11 May 2022 10:34:43 +0100 Subject: [PATCH 151/161] proxysql: 2.3.2 -> 2.4.3 https://github.com/sysown/proxysql/releases/tag/v2.4.0 https://github.com/sysown/proxysql/releases/tag/v2.4.1 https://github.com/sysown/proxysql/releases/tag/v2.4.2 https://github.com/sysown/proxysql/releases/tag/v2.4.3 --- pkgs/servers/sql/proxysql/default.nix | 24 ++---- pkgs/servers/sql/proxysql/makefiles.patch | 100 ++++++++++------------ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 54 insertions(+), 74 deletions(-) diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index 2e4ecd8bb974..f4c244e6632a 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoconf , automake , bison @@ -18,9 +17,10 @@ , libgcrypt , libinjection , libmicrohttpd_0_9_70 +, libuuid , lz4 , nlohmann_json -, openssl +, openssl_3 , pcre , perl , python2 @@ -30,22 +30,18 @@ stdenv.mkDerivation rec { pname = "proxysql"; - version = "2.3.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "sysown"; repo = pname; rev = version; - sha256 = "13l4bf7zhfjy701qx9hfr40vlsm4d0pbfmwr5d6lf514xznvsnzl"; + hash = "sha256-gh0x8wi1v/+iUlE4JymOyD/NI7rL+2/JJQYGAcsL7/g="; }; patches = [ ./makefiles.patch ./dont-phone-home.patch - (fetchpatch { - url = "https://github.com/sysown/proxysql/pull/3402.patch"; - sha256 = "079jjhvx32qxjczmsplkhzjn9gl7c2a3famssczmjv2ffs65vibi"; - }) ]; nativeBuildInputs = [ @@ -59,14 +55,16 @@ stdenv.mkDerivation rec { buildInputs = [ bison - curl + (curl.override { openssl = openssl_3; }) flex gnutls libgcrypt - openssl + libuuid zlib ]; + enableParallelBuilding = true; + GIT_VERSION = version; dontConfigure = true; @@ -103,7 +101,7 @@ stdenv.mkDerivation rec { { f = "libev"; p = libev; } { f = "libinjection"; p = libinjection; } { f = "libmicrohttpd"; p = libmicrohttpd_0_9_70; } - { f = "libssl"; p = openssl; } + { f = "libssl"; p = openssl_3; } { f = "lz4"; p = lz4; } { f = "pcre"; p = pcre; } { f = "re2"; p = re2; } @@ -126,10 +124,6 @@ stdenv.mkDerivation rec { sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config - # https://github.com/sysown/proxysql/issues/3679 - # TODO: remove when upgrading past 2.3.2 - sed -i -e 's@^\(\s\+cd curl/curl \&\& ./configure .*\) \(--with-ssl=.*\)$@\1 --without-zstd \2@' Makefile - popd patchShebangs . ''; diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/servers/sql/proxysql/makefiles.patch index edc77a80ca5a..a5c4d7f80cc2 100644 --- a/pkgs/servers/sql/proxysql/makefiles.patch +++ b/pkgs/servers/sql/proxysql/makefiles.patch @@ -1,6 +1,8 @@ +diff --git a/Makefile b/Makefile +index fba4e6a1..ceff4f3d 100644 --- a/Makefile +++ b/Makefile -@@ -46,11 +46,7 @@ endif +@@ -57,11 +57,7 @@ endif export MAKEOPT=-j ${NPROCS} @@ -13,7 +15,7 @@ USERCHECK := $(shell getent passwd proxysql) GROUPCHECK := $(shell getent group proxysql) -@@ -523,16 +519,10 @@ cleanbuild: +@@ -724,16 +720,10 @@ cleanbuild: .PHONY: install install: src/proxysql @@ -33,62 +35,58 @@ else install -m 0755 etc/init.d/proxysql /etc/init.d ifeq ($(DISTRO),"CentOS Linux") +diff --git a/deps/Makefile b/deps/Makefile +index 13eed9c5..9abb2262 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -40,22 +40,10 @@ endif +@@ -65,18 +65,11 @@ endif libinjection/libinjection/src/libinjection.a: -- cd libinjection && rm -rf libinjection-3.10.0 || true +- cd libinjection && rm -rf libinjection-*/ || true - cd libinjection && tar -zxf libinjection-3.10.0.tar.gz -- sed -i -e 's/python/python2/' libinjection/libinjection-3.10.0/src/make_parens.py -- sed -i -e 's/python/python2/' libinjection/libinjection-3.10.0/src/sqlparse_map.py -- sed -i -e 's/python/python2/' libinjection/libinjection-3.10.0/src/sqlparse2c.py +-ifneq ($(CENTOSVER),6) +- cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff +-endif + sed -i 's/CC=/CC?=/' libinjection/libinjection/src/Makefile cd libinjection/libinjection && CC=${CC} CXX=${CXX} ${MAKE} libinjection: libinjection/libinjection/src/libinjection.a libssl/openssl/libssl.a: --# cd libssl && rm -rf openssl-1.1.0h || true --# cd libssl && tar -zxf openssl-1.1.0h.tar.gz -- cd libssl && rm -rf openssl-1.1.1d || true -- cd libssl && rm -rf openssl-1.1.0h || true -- cd libssl && rm -rf openssl-1.1.1g || true -- cd libssl && rm -rf openssl-1.1.1j || true -- cd libssl && tar -zxf openssl-1.1.1j.tar.gz - cd libssl/openssl && ./config no-ssl3 - cd libssl/openssl && CC=${CC} CXX=${CXX} ${MAKE} - cd libssl/openssl && ln -s . lib # curl wants this path -@@ -70,9 +58,6 @@ ifeq ($(MIN_VERSION),$(lastword $(sort $(GCC_VERSION) $(MIN_VERSION)))) +- cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true +- cd libssl && tar -zxf openssl-*.tar.gz + cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch + cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch + cd libssl/openssl && ./config no-ssl3 no-tests +@@ -93,8 +86,6 @@ ifeq ($(MIN_VERSION),$(lastword $(sort $(GCC_VERSION) $(MIN_VERSION)))) endif - libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a -- cd libhttpserver && rm -rf libhttpserver-master_20191121 || true -- cd libhttpserver && rm -rf libhttpserver-0.18.1 || true + libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a +- cd libhttpserver && rm -rf libhttpserver-*/ || true - cd libhttpserver && tar -zxf libhttpserver-0.18.1.tar.gz ifeq ($(REQUIRE_PATCH), true) cd libhttpserver/libhttpserver && patch src/httpserver/basic_auth_fail_response.hpp < ../basic_auth_fail_response.hpp.patch cd libhttpserver/libhttpserver && patch src/httpserver/create_webserver.hpp < ../create_webserver.hpp.patch -@@ -94,34 +79,15 @@ endif +@@ -117,34 +108,16 @@ endif libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a libev/libev/.libs/libev.a: -- cd libev && rm -rf libev-4.24 || true +- cd libev && rm -rf libev-*/ || true - cd libev && tar -zxf libev-4.24.tar.gz + cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch cd libev/libev && ./configure cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE} ev: libev/libev/.libs/libev.a curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a -- cd curl && rm -rf curl-7.57.0 || true -- cd curl && rm -rf curl-7.77.0 || true -- cd curl && tar -zxf curl-7.77.0.tar.gz +- cd curl && rm -rf curl-*/ || true +- cd curl && tar -zxf curl-*.tar.gz - #cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE} - cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=no && CC=${CC} CXX=${CXX} ${MAKE} + cd curl/curl && CFLAGS=-fPIC ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=no && CC=${CC} CXX=${CXX} ${MAKE} curl: curl/curl/lib/.libs/libcurl.a libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a: -- cd libmicrohttpd && rm -rf libmicrohttpd-0.9.55 || true -- cd libmicrohttpd && rm -rf libmicrohttpd-0.9.68 || true +- cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true - cd libmicrohttpd && rm -f libmicrohttpd || true -ifeq ($(CENTOSVER),6) - cd libmicrohttpd && ln -s libmicrohttpd-0.9.55 libmicrohttpd @@ -96,6 +94,7 @@ -else - cd libmicrohttpd && ln -s libmicrohttpd-0.9.68 libmicrohttpd - cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.68.tar.gz +- cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch -endif -ifeq ($(OS),Darwin) - cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/mhd_sockets.c < ../mhd_sockets.c-issue-5977.patch @@ -103,37 +102,29 @@ cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a -@@ -132,8 +98,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: +@@ -155,8 +128,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: cityhash: cityhash/cityhash/src/.libs/libcityhash.a lz4/lz4/liblz4.a: -- cd lz4 && rm -rf lz4-1.7.5 || true +- cd lz4 && rm -rf lz4-*/ || true - cd lz4 && tar -zxf lz4-1.7.5.tar.gz cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} lz4: lz4/lz4/liblz4.a -@@ -148,16 +112,14 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a +@@ -181,8 +152,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s - libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: -- cd libdaemon && rm -rf libdaemon-0.14 + libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: +- cd libdaemon && rm -rf libdaemon-*/ || true - cd libdaemon && tar -zxf libdaemon-0.14.tar.gz cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && ./configure --disable-examples cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE} - libdaemon: libdaemon/libdaemon/libdaemon/.libs/libdaemon.a - - jemalloc/jemalloc/lib/libjemalloc.a: - cd jemalloc && rm -rf jemalloc-5.2.0 - cd jemalloc && tar -jxf jemalloc-5.2.0.tar.bz2 - cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue823.520.patch - cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue2358.patch - cd jemalloc/jemalloc && ./configure ${MYJEOPT} -@@ -210,17 +170,12 @@ sqlite3/sqlite3/sqlite3.o: +@@ -253,17 +222,12 @@ sqlite3/sqlite3/sqlite3.o: sqlite3: sqlite3/sqlite3/sqlite3.o libconfig/libconfig/lib/.libs/libconfig++.a: -- cd libconfig && rm -rf libconfig-1.7.2 +- cd libconfig && rm -rf libconfig-*/ || true - cd libconfig && tar -zxf libconfig-1.7.2.tar.gz cd libconfig/libconfig && ./configure --disable-examples cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE} @@ -141,32 +132,29 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: -- cd prometheus-cpp && rm -rf prometheus-cpp-0.9.0 +- cd prometheus-cpp && rm -rf prometheus-cpp-*/ || true - cd prometheus-cpp && tar -zxf v0.9.0.tar.gz - cd prometheus-cpp && tar --strip-components=1 -zxf civetweb-v1.11.tar.gz -C prometheus-cpp/3rdparty/civetweb cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p0 < ../registry_counters_reset.patch - cd prometheus-cpp/prometheus-cpp && cmake . -DBUILD_SHARED_LIBS=OFF -DENABLE_TESTING=OFF -DENABLE_PUSH=OFF -@@ -229,12 +184,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: + cd prometheus-cpp/prometheus-cpp && patch -p0 < ../include_limits.patch +@@ -273,10 +237,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a re2/re2/obj/libre2.a: -- cd re2 && rm -rf re2-2018-07-01 || true -- cd re2 && rm -rf re2-2020-07-06 || true --# cd re2 && tar -zxf re2-20140304.tgz +- cd re2 && rm -rf re2-*/ || true - cd re2 && tar -zxf re2.tar.gz -# cd re2/re2 && sed -i -e 's/-O3 -g /-O3 -fPIC /' Makefile --# cd re2 && patch re2/util/mutex.h < mutex.h.patch +-# cd re2/re2 && patch util/mutex.h < ../mutex.h.patch + cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch cd re2/re2 && sed -i -e 's/-O3 /-O3 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile cd re2/re2 && sed -i -e 's/RE2_CXXFLAGS?=-std=c++11 /RE2_CXXFLAGS?=-std=c++11 -fPIC /' Makefile - cd re2/re2 && CC=${CC} CXX=${CXX} ${MAKE} -@@ -242,9 +191,6 @@ re2/re2/obj/libre2.a: +@@ -285,8 +245,6 @@ re2/re2/obj/libre2.a: re2: re2/re2/obj/libre2.a pcre/pcre/.libs/libpcre.a: -- cd pcre && rm -rf pcre-8.39 -- cd pcre && rm -rf pcre-8.44 +- cd pcre && rm -rf pcre-*/ || true - cd pcre && tar -zxf pcre-8.44.tar.gz + cd pcre/pcre && patch pcretest.c < ../pcretest.c-multiplication-overflow.patch cd pcre/pcre && ./configure cd pcre/pcre && CC=${CC} CXX=${CXX} ${MAKE} - pcre: pcre/pcre/.libs/libpcre.a diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50f6cb1c482c..941f4a54edc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9946,9 +9946,7 @@ with pkgs; proxify = callPackage ../tools/networking/proxify { }; - proxysql = callPackage ../servers/sql/proxysql { - stdenv = if stdenv.targetPlatform.isx86_64 then gcc10Stdenv else stdenv; - }; + proxysql = callPackage ../servers/sql/proxysql { }; prs = callPackage ../tools/security/prs { }; From b6dad2afe6684c6db2b33d7a5b0191eff2a2a5a4 Mon Sep 17 00:00:00 2001 From: Anatolii Prylutskyi Date: Fri, 5 Aug 2022 17:27:34 +0300 Subject: [PATCH 152/161] moq: init at 0.2.7 --- pkgs/development/tools/moq/default.nix | 34 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/tools/moq/default.nix diff --git a/pkgs/development/tools/moq/default.nix b/pkgs/development/tools/moq/default.nix new file mode 100644 index 000000000000..40f004d6e5bf --- /dev/null +++ b/pkgs/development/tools/moq/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "moq"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "matryer"; + repo = "moq"; + rev = "v${version}"; + sha256 = "sha256-me/KD8bgzA+VU7WrfKlk8HZTInJqhijLAVTiZcJRzms="; + }; + + vendorSha256 = "sha256-XTe52pytjZYJALBOcnytA8z/d3UHSKcU1lJmJm8Iawo="; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/matryer/moq"; + description = "Interface mocking tool for go generate"; + longDescription = '' + Moq is a tool that generates a struct from any interface. The struct can + be used in test code as a mock of the interface. + ''; + license = licenses.mit; + maintainers = with maintainers; [ anpryl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c62557b39f40..322f80e9a2f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24221,6 +24221,8 @@ with pkgs; impl = callPackage ../development/tools/impl { }; + moq = callPackage ../development/tools/moq { }; + quicktemplate = callPackage ../development/tools/quicktemplate { }; linux_logo = callPackage ../tools/misc/linux-logo { }; From fddb453352f20ffddd3fce75a3da04682d5a25ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 19:40:44 +0000 Subject: [PATCH 153/161] patchelfUnstable: unstable-2022-02-21 -> unstable-2022-07-16 --- pkgs/development/tools/misc/patchelf/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 350424747e88..bbabfcac717a 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "unstable-2022-02-21"; + version = "unstable-2022-07-16"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "a35054504293f9ff64539850d1ed0bfd2f5399f2"; - sha256 = "sha256-/hD/abmzWSkDhAWPLHiLQQ9cwJF8oFDuovNzRqs3Bho="; + rev = "c2b419dc2a0d6095eaa69b65ad5854ce847bdd01"; + sha256 = "sha256-8U3EFO6nKTpPurrmdT3SjwiuU07Aztrp71Oe3CLQvcw="; }; # Drop test that fails on musl (?) From 6a4213ff8cff1b23455d47e8390482397d2988e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 16:30:22 +0000 Subject: [PATCH 154/161] latex2html: 2022 -> 2022.2 --- pkgs/tools/misc/latex2html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 8765506ce305..84bda9e684b3 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "latex2html"; - version = "2022"; + version = "2022.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-a+OFBNMtP6mDqg1k9rjDLEJhZDM+zdRpPbn3aeC+Qks="; + sha256 = "sha256-Vl7ozawd4Ra+yDarRpmPhjF7deJELaxo07L4/qVV4fw="; }; buildInputs = [ ghostscript netpbm perl ]; From a8b05f0e61a7b80a87c4473cd6bdb7cf62216e38 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Aug 2022 11:00:06 +0800 Subject: [PATCH 155/161] Revert "mullvad-vpn: 2022.2 -> 2022.3" --- pkgs/applications/networking/mullvad-vpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 48189e7bfa56..d1091068c6b4 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2022.3"; + version = "2022.2"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "sha256-AxBVH5dHp1IBgeAMEUm+6xgHNuDChNs1+kOinbsUJu0="; + sha256 = "sha256-h/c4aPH6E2TzbXGROpLJgF9uHYcjvKiW5upIobpJM9o="; }; nativeBuildInputs = [ From a1e1e5b2a7115454e50751fbbe6382addf232b95 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 14 Aug 2022 12:01:07 +0800 Subject: [PATCH 156/161] lunatic: fix hydra build --- pkgs/development/interpreters/lunatic/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix index e68240bb041a..9e716694759c 100644 --- a/pkgs/development/interpreters/lunatic/default.nix +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -17,6 +17,11 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; + checkFlags = [ + # requires simd support which is not always available on hydra + "--skip=state::tests::import_filter_signature_matches" + ]; + meta = with lib; { description = "An Erlang inspired runtime for WebAssembly"; homepage = "https://lunatic.solutions"; From 2277556362e175af2715062a9a17170fb2ae8984 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 14 Aug 2022 10:26:16 +0800 Subject: [PATCH 157/161] capnproto: add optional deps, cleanup cmakeFlags --- pkgs/development/libraries/capnproto/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index eeeaaed4236d..59d4bf364d4b 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -1,8 +1,10 @@ { lib , stdenv , fetchFromGitHub -, capnproto -, cmake }: +, cmake +, openssl +, zlib +}: stdenv.mkDerivation rec { pname = "capnproto"; @@ -16,10 +18,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-vBp4CAfPpd7/hdGk7JBxMTjtFFvXx16ODOfqDd8bAjc="; }; - nativeBuildInputs = [ cmake ] - ++ lib.optional (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) capnproto; - - cmakeFlags = lib.optional (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) "-DEXTERNAL_CAPNP"; + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl zlib ]; meta = with lib; { homepage = "https://capnproto.org/"; From 8138a92a2af2b5071e8d2b8e5e066dd4f7c10dbf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 16 Aug 2022 08:21:23 +1000 Subject: [PATCH 158/161] clusterctl: 1.2.0 -> 1.2.1 https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.2.1 --- pkgs/applications/networking/cluster/clusterctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index f09afe7b65d5..5bcdf921bc3b 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-udlIylkaNZIkJS6TgJemmQr/o73i87Nt8pL2Pbe+AqA="; + sha256 = "sha256-/0CZFvCBesATVGGCJoiM3GfYvCrmDJBHMXhn/o8xhKg="; }; vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg="; From 07730a7b4992a3c7e1b637cc24bb5fbc47b6bad8 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 15 Aug 2022 22:50:27 +0200 Subject: [PATCH 159/161] nomad_1_3: 1.3.2 -> 1.3.3 --- pkgs/applications/networking/cluster/nomad/1.3.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix index 2ab2cf99634c..8d4c9805b52a 100644 --- a/pkgs/applications/networking/cluster/nomad/1.3.nix +++ b/pkgs/applications/networking/cluster/nomad/1.3.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix { inherit buildGoModule; - version = "1.3.2"; - sha256 = "0vrcdm0xjimi5z1j180wigf4gd806w73jxvrzclv2d2pr7pab6qq"; - vendorSha256 = "139bzvaw0nyl0whvs74m2hj2xww08zfd615wkn2y10c8f5h69arj"; + version = "1.3.3"; + sha256 = "sha256-/63QGknivXyBel2MhMzbh/rE+UrfV3mb+zPZzOU15WU="; + vendorSha256 = "sha256-5ubJ6hgpdkZd/hwy+u2S6XgQLD5xmgUnaUqJoLdguBQ="; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50f6cb1c482c..0438cec07576 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9045,7 +9045,7 @@ with pkgs; }; nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix { # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; + buildGoModule = buildGo118Module; }; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; From b474599529b4572e0e07088e15e6e7818231a9f1 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 16 Aug 2022 01:10:00 +0200 Subject: [PATCH 160/161] nomad: default to nomad_1_3, add to release notes --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 6 ++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index b30bd7940aab..0d0e2647a070 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -479,6 +479,12 @@ dbus service. + + + The nomad package now defaults to 1.3, + which no longer has a downgrade path to releases 1.2 or older. + + diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index c248856a74e5..c560da8df27a 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -165,4 +165,6 @@ Use `configure.packages` instead. - There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service. +- The `nomad` package now defaults to 1.3, which no longer has a downgrade path to releases 1.2 or older. + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0438cec07576..d462b0149147 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9032,7 +9032,7 @@ with pkgs; noip = callPackage ../tools/networking/noip { }; - nomad = nomad_1_2; + nomad = nomad_1_3; # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled @@ -9040,11 +9040,9 @@ with pkgs; # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md nomad_1_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo118Module; }; From 38f9a57c3b3fe2e50da3175fd98e545e27b3ac0e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 15 Aug 2022 11:04:01 +0300 Subject: [PATCH 161/161] =?UTF-8?q?osm2pgsql:=201.6.0=20=E2=86=92=201.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/osm2pgsql/default.nix | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 0a3103cd4f94..297f98ee3db3 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , cmake , expat +, fmt , proj , bzip2 , zlib @@ -12,33 +13,43 @@ , luajit , libosmium , protozero +, rapidjson }: stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "sha256-6FVMv+DowMYdRdsQFL2iwG/V9D2cLWkHUVkmR3/TuUI="; + hash = "sha256-MWJzCZdqvy/nH1Doj0fmGuzTubaHDnPOED7qgzvJ3ZU="; }; + postPatch = '' + # Remove bundled libraries + rm -r contrib + ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium protozero ] + buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero rapidjson ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; - cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ] - ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + cmakeFlags = [ + "-DEXTERNAL_LIBOSMIUM=ON" + "-DEXTERNAL_PROTOZERO=ON" + "-DEXTERNAL_RAPIDJSON=ON" + "-DEXTERNAL_FMT=ON" + ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; meta = with lib; { description = "OpenStreetMap data to PostgreSQL converter"; homepage = "https://osm2pgsql.org"; license = licenses.gpl2Plus; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; maintainers = with maintainers; [ jglukasik das-g ]; }; }