diff options
Diffstat (limited to 'pkgs')
168 files changed, 1520 insertions, 5103 deletions
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 20e9dc56c4c16..d0bd585847985 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2412,6 +2412,38 @@ let }; }; + ms-python.black-formatter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "black-formatter"; + publisher = "ms-python"; + version = "2023.4.1"; + sha256 = "sha256-IJaLke0WF1rlKTiuwJHAXDQB1SS39AoQhc4iyqqlTyY="; + }; + meta = with lib; { + description = "Formatter extension for Visual Studio Code using black"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.black-formatter"; + homepage = "https://github.com/microsoft/vscode-black-formatter"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; + }; + + ms-python.isort = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "isort"; + publisher = "ms-python"; + version = "2023.10.1"; + sha256 = "sha256-NRsS+mp0pIhGZiqxAMXNZ7SwLno9Q8pj+RS1WB92HzU="; + }; + meta = with lib; { + description = "Import sorting extension for Visual Studio Code using isort"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.isort"; + homepage = "https://github.com/microsoft/vscode-isort"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; + }; + ms-python.python = callPackage ./ms-python.python { }; ms-python.vscode-pylance = buildVscodeMarketplaceExtension { diff --git a/pkgs/applications/file-managers/xplr/default.nix b/pkgs/applications/file-managers/xplr/default.nix index 4885783abacad..5f058f2baf3ef 100644 --- a/pkgs/applications/file-managers/xplr/default.nix +++ b/pkgs/applications/file-managers/xplr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "xplr"; @@ -11,19 +11,23 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-lqFhLCOLiuSQWhbcZUEj2xFRlZ+x1ZTVc8IJw7tJjhE="; }; - buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoHash = "sha256-3hrpg2cMvIuFy6mH1/1igIpU4nbzFQLCAhiIRZbTuaI="; - checkFlags = [ - # failure: path::tests::test_relative_to_parent - "--skip=path::tests::test_relative_to_parent" - ]; + # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin + env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) { + TARGET_STRIP = "${stdenv.cc.targetPrefix}strip"; + }; + + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config + ''; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; homepage = "https://xplr.dev"; + changelog = "https://github.com/sayanarijit/xplr/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame ]; + maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame figsoda ]; }; } diff --git a/pkgs/applications/file-managers/yazi/default.nix b/pkgs/applications/file-managers/yazi/default.nix new file mode 100644 index 0000000000000..ef9c47490c0ba --- /dev/null +++ b/pkgs/applications/file-managers/yazi/default.nix @@ -0,0 +1,73 @@ +{ rustPlatform +, fetchFromGitHub +, lib + +, makeWrapper +, stdenv +, Foundation + +, withFile ? true +, file +, withJq ? true +, jq +, withPoppler ? true +, poppler_utils +, withUnar ? true +, unar +, withFfmpegthumbnailer ? true +, ffmpegthumbnailer +, withFd ? true +, fd +, withRipgrep ? true +, ripgrep +, withFzf ? true +, fzf +, withZoxide ? true +, zoxide + +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "yazi"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "sxyazi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IUE2846AltYyEefkavCJOEak9mW0wygojWsucwUEgh4="; + }; + + cargoHash = "sha256-wwtdaReb+teXf+VDwqAqCbSy2qWI11IRlcygmWdaqF4="; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + + postInstall = with lib; + let + runtimePaths = [ ] + ++ optional withFile file + ++ optional withJq jq + ++ optional withPoppler poppler_utils + ++ optional withUnar unar + ++ optional withFfmpegthumbnailer ffmpegthumbnailer + ++ optional withFd fd + ++ optional withRipgrep ripgrep + ++ optional withFzf fzf + ++ optional withZoxide zoxide; + in + '' + wrapProgram $out/bin/yazi \ + --prefix PATH : "${makeBinPath runtimePaths}" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Blazing fast terminal file manager written in Rust, based on async I/O"; + homepage = "https://github.com/sxyazi/yazi"; + license = licenses.mit; + maintainers = with maintainers; [ xyenon matthiasbeyer ]; + }; +} diff --git a/pkgs/applications/graphics/oculante/Cargo.lock b/pkgs/applications/graphics/oculante/Cargo.lock index 4b71b4662fd92..54ba65ae7f0d2 100644 --- a/pkgs/applications/graphics/oculante/Cargo.lock +++ b/pkgs/applications/graphics/oculante/Cargo.lock @@ -3219,7 +3219,7 @@ dependencies = [ [[package]] name = "oculante" -version = "0.7.2" +version = "0.7.3" dependencies = [ "anyhow", "arboard", diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index 271a9dba88273..44a98828c85a9 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -21,13 +21,13 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "woelper"; repo = pname; rev = version; - hash = "sha256-OJKmnH1uJvVnHiuieveDaR+lybpWHC3MZvis0iAKiZU="; + hash = "sha256-Q4YEBEA+Kt09Se9b03EZ6phm+6Q3fAxXCZRXQeqPA2k="; }; cargoLock = { diff --git a/pkgs/applications/misc/nimbo/default.nix b/pkgs/applications/misc/nimbo/default.nix index 5ad86eeccd448..ffc01c747f9b4 100644 --- a/pkgs/applications/misc/nimbo/default.nix +++ b/pkgs/applications/misc/nimbo/default.nix @@ -52,6 +52,6 @@ python3.pkgs.buildPythonApplication rec { description = "Run machine learning jobs on AWS with a single command"; homepage = "https://github.com/nimbo-sh/nimbo"; license = licenses.bsl11; - maintainers = with maintainers; [ alexeyre noreferences ]; + maintainers = with maintainers; [ noreferences ]; }; } diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 4da57993fb87a..7791f694e8579 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -53,6 +53,6 @@ python3.pkgs.buildPythonApplication rec { description = "Simple terminal user interface for Signal"; homepage = "https://github.com/isamert/scli"; license = licenses.gpl3Only; - maintainers = with maintainers; [ alexeyre ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 8c25377f66317..b1301c7b70bfa 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -23,7 +23,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.1.3035.204"; + version = "6.1.3035.302"; suffix = { aarch64-linux = "arm64"; @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-i2eIm4AF7avjy3KSUvoOOKWw7Q+BatozGpy/yyX4Esg="; - x86_64-linux = "sha256-TLuTYXp6EdQDBWPM1TEXwhdxWWMSPKIi5fW+SGUVdRo="; + aarch64-linux = "sha256-HWnHuLcJrV4yYt/l0iLl0N2p9v7r5RwQod1s0op52Z4="; + x86_64-linux = "sha256-NPmiatlGK+8GJHwDXyOZ+J1PSN7Oj8sAKfm6r1usI1E="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 9da400620c2c3..d82c1bce0318b 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.9.23"; + version = "0.9.26"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-opq6XurS3hWI7U3fukTy2VdxxVJAO16mCjd6CZyAJ1w="; + hash = "sha256-difvEmFfwH7+d2qAcNwTcydP0WHDvHkOSXilaWLrHoM="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-cI/Q6eeLw3oJtEHNcFvl5nq+x4dSJUDI/BdLkMzkncs="; + vendorHash = "sha256-bWiBY3Bo/FpipUHhbsbPNLKxvJF7L0tpuPi0Cb0firU="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ @@ -52,6 +52,6 @@ buildGoModule rec { homepage = "https://github.com/alexellis/arkade"; description = "Open Source Kubernetes Marketplace"; license = licenses.mit; - maintainers = with maintainers; [ welteki techknowlogick ]; + maintainers = with maintainers; [ welteki techknowlogick qjoly ]; }; } diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index 06b503181912c..98a051cb7c3b5 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.3.1"; + version = "7.4.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bCZuX4c/ltnq1se/tbqQmWBc7/6IRUWqSNg7T3pFl3k="; + sha256 = "sha256-Hxak76S3+i5G81Xv4wdFvR/+vg5Eh86YjeqRzNUmfh4="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kfctl/default.nix b/pkgs/applications/networking/cluster/kfctl/default.nix deleted file mode 100644 index efb36b00c6c2d..0000000000000 --- a/pkgs/applications/networking/cluster/kfctl/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "kfctl"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "kubeflow"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-FY7o4QULobLY1djfcc2l6awE/v2stN7cc2lffMkjoPc="; - }; - - vendorSha256 = null; #vendorSha256 = ""; - - subPackages = [ "cmd/kfctl" ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --cmd eksctl \ - --bash <($out/bin/kfctl completion bash) \ - --zsh <($out/bin/kfctl completion zsh) - ''; - - meta = with lib; { - description = "A CLI for deploying and managing Kubeflow"; - homepage = "https://github.com/kubeflow/kfctl"; - license = licenses.asl20; - maintainers = with maintainers; [ mvnetbiz ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check - }; -} diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index ff7f28f73bb57..c5d72a4dc236e 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gdR9Dfzvf/OR+SDFLzN5GMNyrkuqm6z7cF8QR/L+Bh8="; + sha256 = "sha256-woiFCirM2psmwcKGgQngOJuYZDI2t81xkSzVi4svtXs="; }; - vendorHash = "sha256-DURAWzJDkI2Q/3d6FFx+EbMFkUr6evcbtXZzkh1HG1Y="; + vendorHash = "sha256-3xT5WPBcEclXad8zBA+T7/M6fDmfMWljV8NuxvtvTsA="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index fc1c948ae495a..84827d228108b 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.9.3"; + version = "3.9.4"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-IP6rVOrhIWrEWqrA0BCthAbCD2pRNnDzvY7bP4ANTCc="; + hash = "sha256-cdmW0VSWjr3rm/1T0uDy1iPm3ojR5wrgRixyjIQhodU="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 7137b62502b8b..a606b3f130efe 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.11.11"; + version = "0.12.0"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - hash = "sha256-IKKWJBe6A3TVWIRTDyWbfRYMwgRNhSqSJK0ZRZNCVkA="; + hash = "sha256-PMLc0o+zwtdtY2p5z5xwdcawNKddenr64vmC+dxrw+Y="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 030274f21e515..8d15b8e466b8f 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+dKS9lp5M8vh0V4VGyWAozozdsyCPpCZR4CQK5s51Ds="; + hash = "sha256-oqsLqmyLrvb8u9cj68OemUfunbP98/BZjmoGl1Mctrk="; }; - cargoHash = "sha256-CzrOsLUTfZ2uEIj/AHFmdfZniwlQ6fIkL2pbBHF8YkU="; + cargoHash = "sha256-DEHMF6sTH3BF8lqOV5G4F3+Tsafrhzr0YLqSgV3gq9I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 5defcf1b699f9..6d0cfdccde462 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib +{ stdenv, fetchurl, lib , ncurses, openssl, aspell, gnutls, gettext , zlib, curl, pkg-config, libgcrypt , cmake, libobjc, libresolv, libiconv @@ -36,23 +36,16 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.0.3"; + version = "4.0.4"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-iA29zo5zs/SAKggsShp8YZQ9vFhn16lWleTkY8ZTWpI="; + hash = "sha256-rl9JebWtoDObhOdB1ffkge6R4/7NQKCZB7ZHUYKetvY="; }; - patches = lib.optional (perlSupport && lib.versionAtLeast perl.version "5.38") (fetchpatch { - name = "perl538-locale.patch"; - url = "https://github.com/weechat/weechat/commit/c5eb982424150894959b978d98dcf6a005eb6c9f.patch"; - excludes = [ "ChangeLog.adoc" ]; - sha256 = "sha256-SSDZy4/c12LOxjvFMuJSv6gJEX298wF62/gQLQ/geiU="; - }); - outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; cmakeFlags = with lib; [ diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index bca6c566b74c6..768f56c56d5f7 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "1a7dlwuUOHeCsB+ofAOPlbyuh/QAB8kf50MsocMNz70="; + sha256 = "QOdGltz4wns1vq0Nv/O65koMYkLmPAAP4hKp301dAKI="; }; nativeBuildInputs = [ @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "A GTK-based news feed aggregator"; homepage = "http://lzone.de/liferea/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ romildo ]; + maintainers = with maintainers; [ romildo yayayayaka ]; platforms = platforms.linux; longDescription = '' diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index d110370bb1a07..adce1d4801f8f 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.9.2"; + version = "3.9.3"; outputs = [ "out" "dev" ]; @@ -33,7 +33,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-QtZy5ccr55u8bQVBCFRNu/HJiYtNJX9BgtSV700QX0g="; + sha256 = "sha256-9DfQZ3AFyiUKwt8IqAgjQlQ2XJtwkLEtPM5+VH+x/6c="; }; patches = [ diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index f105450034edb..36084ae3acda7 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -3,6 +3,7 @@ , autoconf , automake , fetchFromGitHub +, fetchpatch , libpcap , ncurses , openssl @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-gFba2wOU4GwpOZTo5A2QpBgnC6OgDJEeyaPGHbA+7tA="; }; + patches = [ + (fetchpatch { + name = "CVE-2023-36192.patch"; + url = "https://github.com/irontec/sngrep/commit/ad1daf15c8387bfbb48097c25197bf330d2d98fc.patch"; + hash = "sha256-g8fxvxi3d7jmZEKTbxqw29hJbm/ShsKKxstsOUGxTug="; + }) + ]; + nativeBuildInputs = [ autoconf automake @@ -44,6 +53,8 @@ stdenv.mkDerivation rec { ./bootstrap.sh ''; + doCheck = true; + meta = with lib; { description = "A tool for displaying SIP calls message flows from terminal"; homepage = "https://github.com/irontec/sngrep"; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 1bfb4c74f6335..5e45bb2c08442 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -23,13 +23,13 @@ gnuradio3_8.pkgs.mkDerivation rec { pname = "qradiolink"; - version = "0.8.9-1"; + version = "0.8.10-1"; src = fetchFromGitHub { owner = "qradiolink"; repo = "qradiolink"; rev = version; - sha256 = "sha256-yY9sdLFaG0fX/4obImxVAyJk13RklYjX99Ch9hgzTe8="; + sha256 = "sha256-DOf5Ct8a9EGpO3YLef+Hw87m5tCVqD30weVOeis9agI="; }; preBuild = '' diff --git a/pkgs/applications/version-management/git-privacy/default.nix b/pkgs/applications/version-management/git-privacy/default.nix index 0a87793639d8e..0fe486dbc2d12 100644 --- a/pkgs/applications/version-management/git-privacy/default.nix +++ b/pkgs/applications/version-management/git-privacy/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "git-privacy"; - version = "2.1.0"; + version = "2.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "EMPRI-DEVOPS"; repo = pname; rev = "v${version}"; - sha256 = "0hfy43fip1l81672xfwqrz1jryzkjy7h9f2lyikxgibibil0p444"; + hash = "sha256-b2RkRL8/mZwqc3xCs+oltzualhQtp/7F9POlLlT3UUU="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index c017b360c36e4..7da2ca8ffd965 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.20.2"; + version = "1.20.3"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-a88ltflOcZQVWcEjC3r6rbPSk6LRtATcEQecYt/wg04="; + hash = "sha256-cn61Z5nYMmzSoHcDoXwuhm+IMn6+iIYPi7KxzO/b5Nw="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 7b994433840b0..ae2388dd18a83 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-qPbJ8h/s4E7EmNlgBdrNZ0AW0D/N7PkK57C1cXjuM9U="; + hash = "sha256-+EHkbAltoYzlDIgMbH3ofhpBLJhv5lq72u7Hh7cpU/M="; fetchSubmodules = true; }; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index ea297047ceafe..816a007596f99 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20230627"; + version = "20230727"; src = fetchFromGitHub { owner = "ddccontrol"; repo = pname; rev = version; - sha256 = "sha256-gRkYoDDD3QCsfZcpIqNAZBAb/si975vyd0NnlWNHob8="; + sha256 = "sha256-TRbFwaYRVHgg7dyg/OFPFkZ9nZ747zaNhnnfMljSOOE="; }; nativeBuildInputs = [ autoreconfHook intltool ]; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 1e07a3a39ebbd..8b9fd04705691 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230810162343"; + version = "20230815132423"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-RzYFpbiy0ajOjyu9Fdw+aJX9cLbquXzfWiLPaszyxOY="; + hash = "sha256-rz7oxcmIQJ9cM7KbQ+zBcBmggGhhhGFad9k0hGLgVgY="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index d24778ffe577a..d1ccd49f1a886 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -6,25 +6,24 @@ , meson , ninja , vala -, python3 -, gtk3 +, gtk4 , glib -, granite +, granite7 +, libadwaita , libgee -, libhandy -, wrapGAppsHook +, wrapGAppsHook4 , appstream }: stdenv.mkDerivation rec { pname = "elementary-feedback"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "feedback"; rev = version; - sha256 = "sha256-QvqyaI9szZuYuE3D6o4zjr5J6mvEzNHqTBWii+gjyMc="; + sha256 = "sha256-hAObgD2Njg1We0rGEu508khoBo+hj0DQAB7N33CVDiM="; }; patches = [ @@ -39,25 +38,19 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ appstream - granite - gtk3 + granite7 + gtk4 + libadwaita libgee - libhandy glib ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch deleted file mode 100644 index ead8bafaa1259..0000000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch +++ /dev/null @@ -1,700 +0,0 @@ -From f23363ad2fa402d59b41ffe2c13a46462c6d2194 Mon Sep 17 00:00:00 2001 -From: Bobby Rong <rjl931189261@126.com> -Date: Fri, 16 Jul 2021 23:28:56 +0800 -Subject: [PATCH] Remove Install Unlisted Engines function - -https://github.com/elementary/switchboard-plug-keyboard/issues/324 - -Co-Authored-By: WORLDofPEACE <worldofpeace@protonmail.ch> - ---- - src/Dialogs/InstallEngineDialog.vala | 140 ----------------- - src/Dialogs/ProgressDialog.vala | 82 ---------- - src/InputMethod/Installer/InstallList.vala | 73 --------- - .../Installer/UbuntuInstaller.vala | 142 ------------------ - src/InputMethod/Installer/aptd-client.vala | 93 ------------ - .../InputMethod/AddEnginesPopover.vala | 12 -- - src/Widgets/InputMethod/LanguagesRow.vala | 43 ------ - src/meson.build | 6 - - 8 files changed, 591 deletions(-) - delete mode 100644 src/Dialogs/InstallEngineDialog.vala - delete mode 100644 src/Dialogs/ProgressDialog.vala - delete mode 100644 src/InputMethod/Installer/InstallList.vala - delete mode 100644 src/InputMethod/Installer/UbuntuInstaller.vala - delete mode 100644 src/InputMethod/Installer/aptd-client.vala - delete mode 100644 src/Widgets/InputMethod/LanguagesRow.vala - -diff --git a/src/Dialogs/InstallEngineDialog.vala b/src/Dialogs/InstallEngineDialog.vala -deleted file mode 100644 -index ffba3a8..0000000 ---- a/src/Dialogs/InstallEngineDialog.vala -+++ /dev/null -@@ -1,140 +0,0 @@ --/* --* Copyright 2019-2020 elementary, Inc. (https://elementary.io) --* --* This program is free software: you can redistribute it and/or modify --* it under the terms of the GNU General Public License as published by --* the Free Software Foundation, either version 3 of the License, or --* (at your option) any later version. --* --* This program is distributed in the hope that it will be useful, --* but WITHOUT ANY WARRANTY; without even the implied warranty of --* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --* GNU General Public License for more details. --* --* You should have received a copy of the GNU General Public License --* along with this program. If not, see <https://www.gnu.org/licenses/>. --*/ -- --public class Pantheon.Keyboard.InputMethodPage.InstallEngineDialog : Granite.MessageDialog { -- private InstallList? engines_filter; -- -- public InstallEngineDialog (Gtk.Window parent) { -- Object ( -- primary_text: _("Choose an engine to install"), -- secondary_text: _("Select an engine from the list to install and use."), -- image_icon: new ThemedIcon ("extension"), -- transient_for: parent, -- buttons: Gtk.ButtonsType.CANCEL -- ); -- } -- -- construct { -- var languages_list = new Gtk.ListBox () { -- activate_on_single_click = true, -- expand = true, -- selection_mode = Gtk.SelectionMode.NONE -- }; -- -- foreach (var language in InstallList.get_all ()) { -- var lang = new LanguagesRow (language); -- languages_list.add (lang); -- } -- -- var back_button = new Gtk.Button.with_label (_("Languages")) { -- halign = Gtk.Align.START, -- margin = 6 -- }; -- back_button.get_style_context ().add_class (Granite.STYLE_CLASS_BACK_BUTTON); -- -- var language_title = new Gtk.Label (""); -- -- var language_header = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6); -- language_header.pack_start (back_button); -- language_header.set_center_widget (language_title); -- -- var listbox = new Gtk.ListBox () { -- expand = true -- }; -- listbox.set_filter_func (filter_function); -- listbox.set_sort_func (sort_function); -- -- foreach (var language in InstallList.get_all ()) { -- foreach (var engine in language.get_components ()) { -- listbox.add (new EnginesRow (engine)); -- } -- } -- -- var scrolled = new Gtk.ScrolledWindow (null, null); -- scrolled.add (listbox); -- -- var engine_list_grid = new Gtk.Grid () { -- orientation = Gtk.Orientation.VERTICAL -- }; -- engine_list_grid.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW); -- engine_list_grid.add (language_header); -- engine_list_grid.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL)); -- engine_list_grid.add (scrolled); -- -- var stack = new Gtk.Stack () { -- height_request = 200, -- width_request = 300, -- transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT -- }; -- stack.add (languages_list); -- stack.add (engine_list_grid); -- -- var frame = new Gtk.Frame (null); -- frame.add (stack); -- -- custom_bin.add (frame); -- custom_bin.show_all (); -- -- var install_button = add_button (_("Install"), Gtk.ResponseType.OK); -- install_button.sensitive = false; -- install_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION); -- -- languages_list.row_activated.connect ((row) => { -- stack.visible_child = engine_list_grid; -- language_title.label = ((LanguagesRow) row).language.get_name (); -- engines_filter = ((LanguagesRow) row).language; -- listbox.invalidate_filter (); -- var adjustment = scrolled.get_vadjustment (); -- adjustment.set_value (adjustment.lower); -- }); -- -- back_button.clicked.connect (() => { -- stack.visible_child = languages_list; -- install_button.sensitive = false; -- }); -- -- listbox.selected_rows_changed.connect (() => { -- foreach (var engines_row in listbox.get_children ()) { -- ((EnginesRow) engines_row).selected = false; -- } -- -- ((EnginesRow) listbox.get_selected_row ()).selected = true; -- install_button.sensitive = true; -- }); -- -- response.connect ((response_id) => { -- if (response_id == Gtk.ResponseType.OK) { -- string engine_to_install = ((EnginesRow) listbox.get_selected_row ()).engine_name; -- UbuntuInstaller.get_default ().install (engine_to_install); -- } -- }); -- } -- -- [CCode (instance_pos = -1)] -- private bool filter_function (Gtk.ListBoxRow row) { -- if (InstallList.get_language_from_engine_name (((EnginesRow) row).engine_name) == engines_filter) { -- return true; -- } -- -- return false; -- } -- -- [CCode (instance_pos = -1)] -- private int sort_function (Gtk.ListBoxRow row1, Gtk.ListBoxRow row2) { -- return ((EnginesRow) row1).engine_name.collate (((EnginesRow) row1).engine_name); -- } --} -diff --git a/src/Dialogs/ProgressDialog.vala b/src/Dialogs/ProgressDialog.vala -deleted file mode 100644 -index 868f167..0000000 ---- a/src/Dialogs/ProgressDialog.vala -+++ /dev/null -@@ -1,82 +0,0 @@ --/* --* Copyright 2011-2020 elementary, Inc. (https://elementary.io) --* --* This program is free software: you can redistribute it --* and/or modify it under the terms of the GNU Lesser General Public License as --* published by the Free Software Foundation, either version 3 of the --* License, or (at your option) any later version. --* --* This program is distributed in the hope that it will be --* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of --* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General --* Public License for more details. --* --* You should have received a copy of the GNU General Public License along --* with this program. If not, see http://www.gnu.org/licenses/. --*/ -- --public class Pantheon.Keyboard.InputMethodPage.ProgressDialog : Granite.Dialog { -- public int progress { -- set { -- if (value >= 100) { -- destroy (); -- } -- -- progress_bar.fraction = value / 100.0; -- } -- } -- -- private Gtk.ProgressBar progress_bar; -- -- construct { -- var image = new Gtk.Image.from_icon_name ("preferences-desktop-locale", Gtk.IconSize.DIALOG) { -- valign = Gtk.Align.START -- }; -- -- var primary_label = new Gtk.Label (null) { -- max_width_chars = 50, -- wrap = true, -- xalign = 0 -- }; -- primary_label.get_style_context ().add_class (Granite.STYLE_CLASS_PRIMARY_LABEL); -- -- unowned UbuntuInstaller installer = UbuntuInstaller.get_default (); -- switch (installer.transaction_mode) { -- case UbuntuInstaller.TransactionMode.INSTALL: -- primary_label.label = _("Installing %s").printf (installer.engine_to_address); -- break; -- case UbuntuInstaller.TransactionMode.REMOVE: -- primary_label.label = _("Removing %s").printf (installer.engine_to_address); -- break; -- } -- -- progress_bar = new Gtk.ProgressBar () { -- hexpand = true, -- valign = Gtk.Align.START, -- width_request = 300 -- }; -- -- var cancel_button = (Gtk.Button) add_button (_("Cancel"), 0); -- -- installer.bind_property ("install-cancellable", cancel_button, "sensitive"); -- -- var grid = new Gtk.Grid () { -- column_spacing = 12, -- margin = 6, -- row_spacing = 6 -- }; -- grid.attach (image, 0, 0, 1, 2); -- grid.attach (primary_label, 1, 0); -- grid.attach (progress_bar, 1, 1); -- grid.show_all (); -- -- border_width = 6; -- deletable = false; -- get_content_area ().add (grid); -- -- cancel_button.clicked.connect (() => { -- installer.cancel_install (); -- destroy (); -- }); -- } --} -diff --git a/src/InputMethod/Installer/InstallList.vala b/src/InputMethod/Installer/InstallList.vala -deleted file mode 100644 -index 275c302..0000000 ---- a/src/InputMethod/Installer/InstallList.vala -+++ /dev/null -@@ -1,75 +0,0 @@ --/* --* 2019-2020 elementary, Inc. (https://elementary.io) --* --* This program is free software: you can redistribute it and/or modify --* it under the terms of the GNU General Public License as published by --* the Free Software Foundation, either version 3 of the License, or --* (at your option) any later version. --* --* This program is distributed in the hope that it will be useful, --* but WITHOUT ANY WARRANTY; without even the implied warranty of --* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --* GNU General Public License for more details. --* --* You should have received a copy of the GNU General Public License --* along with this program. If not, see <https://www.gnu.org/licenses/>. --*/ -- --public enum Pantheon.Keyboard.InputMethodPage.InstallList { -- JA, -- KO, -- ZH; -- -- public string get_name () { -- switch (this) { -- case JA: -- return _("Japanese"); -- case KO: -- return _("Korean"); -- case ZH: -- return _("Chinese"); -- default: -- assert_not_reached (); -- } -- } -- -- public string[] get_components () { -- switch (this) { -- case JA: -- return { "ibus-anthy", "ibus-mozc", "ibus-skk" }; -- case KO: -- return { "ibus-hangul" }; -- case ZH: -- return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin", "ibus-rime" }; -- default: -- assert_not_reached (); -- } -- } -- -- public static InstallList get_language_from_engine_name (string engine_name) { -- switch (engine_name) { -- case "ibus-anthy": -- return JA; -- case "ibus-mozc": -- return JA; -- case "ibus-skk": -- return JA; -- case "ibus-hangul": -- return KO; -- case "ibus-cangjie": -- return ZH; -- case "ibus-chewing": -- return ZH; -- case "ibus-pinyin": -- return ZH; -- case "ibus-rime": -- return ZH; -- default: -- assert_not_reached (); -- } -- } -- -- public static InstallList[] get_all () { -- return { JA, KO, ZH }; -- } --} -diff --git a/src/InputMethod/Installer/UbuntuInstaller.vala b/src/InputMethod/Installer/UbuntuInstaller.vala -deleted file mode 100644 -index b65aa1f..0000000 ---- a/src/InputMethod/Installer/UbuntuInstaller.vala -+++ /dev/null -@@ -1,142 +0,0 @@ --/* --* Copyright 2011-2020 elementary, Inc. (https://elementary.io) --* --* This program is free software: you can redistribute it --* and/or modify it under the terms of the GNU Lesser General Public License as --* published by the Free Software Foundation, either version 3 of the --* License, or (at your option) any later version. --* --* This program is distributed in the hope that it will be --* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of --* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General --* Public License for more details. --* --* You should have received a copy of the GNU General Public License along --* with this program. If not, see http://www.gnu.org/licenses/. --*/ -- --public class Pantheon.Keyboard.InputMethodPage.UbuntuInstaller : Object { -- private AptdProxy aptd; -- private AptdTransactionProxy proxy; -- -- public bool install_cancellable { get; private set; } -- public TransactionMode transaction_mode { get; private set; } -- public string engine_to_address { get; private set; } -- -- public signal void install_finished (string langcode); -- public signal void install_failed (); -- public signal void remove_finished (string langcode); -- public signal void progress_changed (int progress); -- -- public enum TransactionMode { -- INSTALL, -- REMOVE, -- INSTALL_MISSING, -- } -- -- Gee.HashMap<string, string> transactions; -- -- private static GLib.Once<UbuntuInstaller> instance; -- public static unowned UbuntuInstaller get_default () { -- return instance.once (() => { -- return new UbuntuInstaller (); -- }); -- } -- -- private UbuntuInstaller () {} -- -- construct { -- transactions = new Gee.HashMap<string, string> (); -- aptd = new AptdProxy (); -- -- try { -- aptd.connect_to_aptd (); -- } catch (Error e) { -- warning ("Could not connect to APT daemon"); -- } -- } -- -- public void install (string engine_name) { -- transaction_mode = TransactionMode.INSTALL; -- engine_to_address = engine_name; -- string[] packages = {}; -- packages += engine_to_address; -- -- foreach (var packet in packages) { -- message ("Packet: %s", packet); -- } -- -- aptd.install_packages.begin (packages, (obj, res) => { -- try { -- var transaction_id = aptd.install_packages.end (res); -- transactions.@set (transaction_id, "i-" + engine_name); -- run_transaction (transaction_id); -- } catch (Error e) { -- warning ("Could not queue downloads: %s", e.message); -- } -- }); -- } -- -- public void cancel_install () { -- if (install_cancellable) { -- warning ("cancel_install"); -- try { -- proxy.cancel (); -- } catch (Error e) { -- warning ("cannot cancel installation:%s", e.message); -- } -- } -- } -- -- private void run_transaction (string transaction_id) { -- proxy = new AptdTransactionProxy (); -- proxy.finished.connect (() => { -- on_apt_finshed (transaction_id, true); -- }); -- -- proxy.property_changed.connect ((prop, val) => { -- if (prop == "Progress") { -- progress_changed ((int) val.get_int32 ()); -- } -- -- if (prop == "Cancellable") { -- install_cancellable = val.get_boolean (); -- } -- }); -- -- try { -- proxy.connect_to_aptd (transaction_id); -- proxy.simulate (); -- -- proxy.run (); -- } catch (Error e) { -- on_apt_finshed (transaction_id, false); -- warning ("Could no run transaction: %s", e.message); -- } -- } -- -- private void on_apt_finshed (string id, bool success) { -- if (!success) { -- install_failed (); -- transactions.unset (id); -- return; -- } -- -- if (!transactions.has_key (id)) { //transaction already removed -- return; -- } -- -- var action = transactions.get (id); -- var lang = action[2:action.length]; -- -- message ("ID %s -> %s", id, success ? "success" : "failed"); -- -- if (action[0:1] == "i") { // install -- install_finished (lang); -- } else { -- remove_finished (lang); -- } -- -- transactions.unset (id); -- } --} -diff --git a/src/InputMethod/Installer/aptd-client.vala b/src/InputMethod/Installer/aptd-client.vala -deleted file mode 100644 -index ee5c3f5..0000000 ---- a/src/InputMethod/Installer/aptd-client.vala -+++ /dev/null -@@ -1,93 +0,0 @@ --/* -- * Copyright (C) 2012 Canonical Ltd -- * -- * This program is free software: you can redistribute it and/or modify -- * it under the terms of the GNU General Public License version 3 as -- * published by the Free Software Foundation. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program. If not, see <http://www.gnu.org/licenses/>. -- * -- * Authored by Pawel Stolowski <pawel.stolowski@canonical.com> -- */ -- --namespace Pantheon.Keyboard.InputMethodPage { -- private const string APTD_DBUS_NAME = "org.debian.apt"; -- private const string APTD_DBUS_PATH = "/org/debian/apt"; -- -- /** -- * Expose a subset of org.debian.apt interfaces -- only what's needed by applications lens. -- */ -- [DBus (name = "org.debian.apt")] -- public interface AptdService : GLib.Object { -- public abstract async string install_packages (string[] packages) throws GLib.Error; -- public abstract async string remove_packages (string[] packages) throws GLib.Error; -- public abstract async void quit () throws GLib.Error; -- } -- -- [DBus (name = "org.debian.apt.transaction")] -- public interface AptdTransactionService : GLib.Object { -- public abstract void run () throws GLib.Error; -- public abstract void simulate () throws GLib.Error; -- public abstract void cancel () throws GLib.Error; -- public signal void finished (string exit_state); -- public signal void property_changed (string property, Variant val); -- } -- -- public class AptdProxy : GLib.Object { -- private AptdService _aptd_service; -- -- public void connect_to_aptd () throws GLib.Error { -- _aptd_service = Bus.get_proxy_sync (BusType.SYSTEM, APTD_DBUS_NAME, APTD_DBUS_PATH); -- } -- -- public async string install_packages (string[] packages) throws GLib.Error { -- string res = yield _aptd_service.install_packages (packages); -- return res; -- } -- -- public async string remove_packages (string[] packages) throws GLib.Error { -- string res = yield _aptd_service.remove_packages (packages); -- return res; -- } -- -- public async void quit () throws GLib.Error { -- yield _aptd_service.quit (); -- } -- } -- -- public class AptdTransactionProxy : GLib.Object { -- public signal void finished (string transaction_id); -- public signal void property_changed (string property, Variant variant); -- -- private AptdTransactionService _aptd_service; -- -- public void connect_to_aptd (string transaction_id) throws GLib.Error { -- _aptd_service = Bus.get_proxy_sync (BusType.SYSTEM, APTD_DBUS_NAME, transaction_id); -- _aptd_service.finished.connect ((exit_state) => { -- debug ("aptd transaction finished: %s\n", exit_state); -- finished (transaction_id); -- }); -- _aptd_service.property_changed.connect ((prop, variant) => { -- property_changed (prop, variant); -- }); -- } -- -- public void simulate () throws GLib.Error { -- _aptd_service.simulate (); -- } -- -- public void run () throws GLib.Error { -- _aptd_service.run (); -- } -- -- public void cancel () throws GLib.Error { -- _aptd_service.cancel (); -- } -- } --} -diff --git a/src/Widgets/InputMethod/AddEnginesPopover.vala b/src/Widgets/InputMethod/AddEnginesPopover.vala -index 110bc1d..8a03ca8 100644 ---- a/src/Widgets/InputMethod/AddEnginesPopover.vala -+++ b/src/Widgets/InputMethod/AddEnginesPopover.vala -@@ -43,8 +43,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { - }; - scrolled.add (listbox); - -- var install_button = new Gtk.Button.with_label (_("Install Unlisted Engines…")); -- - var cancel_button = new Gtk.Button.with_label (_("Cancel")); - - var add_button = new Gtk.Button.with_label (_("Add Engine")); -@@ -55,10 +53,8 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { - margin = 12, - spacing = 6 - }; -- button_box.add (install_button); - button_box.add (cancel_button); - button_box.add (add_button); -- button_box.set_child_secondary (install_button, true); - - var grid = new Gtk.Grid (); - grid.attach (search_entry, 0, 0); -@@ -88,14 +84,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { - listbox.invalidate_filter (); - }); - -- install_button.clicked.connect (() => { -- popdown (); -- -- var install_dialog = new InstallEngineDialog ((Gtk.Window) get_toplevel ()); -- install_dialog.run (); -- install_dialog.destroy (); -- }); -- - cancel_button.clicked.connect (() => { - popdown (); - }); -diff --git a/src/Widgets/InputMethod/LanguagesRow.vala b/src/Widgets/InputMethod/LanguagesRow.vala -deleted file mode 100644 -index dc064ae..0000000 ---- a/src/Widgets/InputMethod/LanguagesRow.vala -+++ /dev/null -@@ -1,43 +0,0 @@ --/* --* 2019-2020 elementary, Inc. (https://elementary.io) --* --* This program is free software: you can redistribute it and/or modify --* it under the terms of the GNU General Public License as published by --* the Free Software Foundation, either version 3 of the License, or --* (at your option) any later version. --* --* This program is distributed in the hope that it will be useful, --* but WITHOUT ANY WARRANTY; without even the implied warranty of --* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --* GNU General Public License for more details. --* --* You should have received a copy of the GNU General Public License --* along with this program. If not, see <https://www.gnu.org/licenses/>. --*/ -- --public class Pantheon.Keyboard.InputMethodPage.LanguagesRow : Gtk.ListBoxRow { -- public InstallList language { get; construct; } -- -- public LanguagesRow (InstallList language) { -- Object (language: language); -- } -- -- construct { -- var label = new Gtk.Label (language.get_name ()) { -- halign = Gtk.Align.START, -- hexpand = true -- }; -- -- var caret = new Gtk.Image.from_icon_name ("pan-end-symbolic", Gtk.IconSize.MENU); -- -- var grid = new Gtk.Grid () { -- margin = 3, -- margin_start = 6, -- margin_end = 6 -- }; -- grid.add (label); -- grid.add (caret); -- -- add (grid); -- } --} -diff --git a/src/meson.build b/src/meson.build -index 77a51d0..26711c5 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -17,7 +17,6 @@ plug_files = files( - 'Widgets/Layout/Display.vala', - 'Widgets/Layout/AdvancedSettingsPanel.vala', - 'Widgets/Layout/AdvancedSettingsGrid.vala', -- 'Widgets/InputMethod/LanguagesRow.vala', - 'Widgets/InputMethod/EnginesRow.vala', - 'Widgets/InputMethod/AddEnginesPopover.vala', - 'Views/Shortcuts.vala', -@@ -33,11 +32,6 @@ plug_files = files( - 'InputSources/SourceSettings.vala', - 'InputSources/InputSource.vala', - 'InputMethod/AddEnginesList.vala', -- 'InputMethod/Installer/UbuntuInstaller.vala', -- 'InputMethod/Installer/InstallList.vala', -- 'InputMethod/Installer/aptd-client.vala', -- 'Dialogs/ProgressDialog.vala', -- 'Dialogs/InstallEngineDialog.vala', - 'Dialogs/ConflictDialog.vala', - 'Dialogs/AddLayoutDialog.vala' - ) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 154a8b65a5cc5..f6512a8a8d74d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -23,17 +23,20 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-X5EGDS8/EazIHiDBHCisd+XPE9dMx/0lQ8hrz9imUno="; + sha256 = "sha256-4LfS2F8pLbZw+HhnEVmZqbEaNCM96q+lqnf4sUBDVJI="; }; patches = [ - ./0001-Remove-Install-Unlisted-Engines-function.patch + # This will try to install packages with apt. + # https://github.com/elementary/switchboard-plug-keyboard/issues/324 + ./hide-install-unlisted-engines-button.patch + (substituteAll { src = ./fix-paths.patch; inherit ibus onboard libgnomekbd; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch index bed4ca5573c87..37f202e98b2ae 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/Views/InputMethod.vala b/src/Views/InputMethod.vala -index 7f73c1e1..1f0d6400 100644 +index ba12d6db..b9263c1d 100644 --- a/src/Views/InputMethod.vala +++ b/src/Views/InputMethod.vala -@@ -328,7 +328,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid { +@@ -338,7 +338,7 @@ public class Keyboard.InputMethodPage.Page : Gtk.Grid { private void spawn_ibus_daemon () { bool is_spawn_succeeded = false; try { @@ -11,24 +11,24 @@ index 7f73c1e1..1f0d6400 100644 } catch (GLib.SpawnError e) { warning (e.message); set_visible_view (e.message); -diff --git a/src/Views/Layout.vala b/src/Views/Layout.vala -index 75d2d805..b86252a4 100644 ---- a/src/Views/Layout.vala -+++ b/src/Views/Layout.vala -@@ -219,7 +219,7 @@ namespace Pantheon.Keyboard { +diff --git a/src/Views/Behavior.vala b/src/Views/Behavior.vala +index 8a89a0a4..a4f98668 100644 +--- a/src/Views/Behavior.vala ++++ b/src/Views/Behavior.vala +@@ -270,7 +270,7 @@ public class Keyboard.Behaviour.Page : Gtk.Box { - onscreen_keyboard_settings.clicked.connect (() => { - try { -- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE); -+ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE); - appinfo.launch (null, null); - } catch (Error e) { - warning ("Unable to launch onboard-settings: %s", e.message); + onscreen_keyboard_settings.clicked.connect (() => { + try { +- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, NONE); ++ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, NONE); + appinfo.launch (null, null); + } catch (Error e) { + critical ("Unable to launch onboard-settings: %s", e.message); diff --git a/src/Dialogs/AddLayoutDialog.vala b/src/Dialogs/AddLayoutDialog.vala -index 7c2efda3..de77094f 100644 +index aa084295..a486b52a 100644 --- a/src/Dialogs/AddLayoutDialog.vala +++ b/src/Dialogs/AddLayoutDialog.vala -@@ -197,7 +197,7 @@ public class Pantheon.Keyboard.LayoutPage.AddLayoutDialog : Granite.Dialog { +@@ -197,7 +197,7 @@ public class Keyboard.LayoutPage.AddLayoutDialog : Granite.Dialog { }); keyboard_map_button.clicked.connect (() => { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-install-unlisted-engines-button.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-install-unlisted-engines-button.patch new file mode 100644 index 0000000000000..6313dc30f6d0c --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-install-unlisted-engines-button.patch @@ -0,0 +1,78 @@ +diff --git a/src/Widgets/InputMethod/AddEnginesPopover.vala b/src/Widgets/InputMethod/AddEnginesPopover.vala +index 478e6b02..5b25f2e9 100644 +--- a/src/Widgets/InputMethod/AddEnginesPopover.vala ++++ b/src/Widgets/InputMethod/AddEnginesPopover.vala +@@ -43,7 +43,6 @@ public class Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { + }; + scrolled.add (listbox); + +- var install_button = new Gtk.Button.with_label (_("Install Unlisted Engines…")); + + var cancel_button = new Gtk.Button.with_label (_("Cancel")); + +@@ -55,10 +54,8 @@ public class Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { + margin = 12, + spacing = 6 + }; +- button_box.add (install_button); + button_box.add (cancel_button); + button_box.add (add_button); +- button_box.set_child_secondary (install_button, true); + + var grid = new Gtk.Grid (); + grid.attach (search_entry, 0, 0); +@@ -88,30 +85,6 @@ public class Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { + listbox.invalidate_filter (); + }); + +- install_button.clicked.connect (() => { +- popdown (); +- +- var installer = UbuntuInstaller.get_default (); +- var install_dialog = new InstallEngineDialog ((Gtk.Window) get_toplevel ()); +- install_dialog.response.connect ((response_id) => { +- if (response_id == Gtk.ResponseType.OK) { +- string engine_to_install = install_dialog.get_selected_engine_name (); +- install_dialog.destroy (); +- installer.install (engine_to_install); +- +- var progress_dialog = new ProgressDialog () { +- transient_for = (Gtk.Window) get_toplevel () +- }; +- installer.progress_changed.connect ((p) => { +- progress_dialog.progress = p; +- }); +- progress_dialog.run (); +- } else { +- install_dialog.destroy (); +- } +- }); +- install_dialog.run (); +- }); + + cancel_button.clicked.connect (() => { + popdown (); +diff --git a/src/meson.build b/src/meson.build +index 83cde9f6..63d6a88a 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -19,7 +19,6 @@ plug_files = files( + 'Widgets/Layout/Display.vala', + 'Widgets/Layout/AdvancedSettingsPanel.vala', + 'Widgets/Layout/AdvancedSettingsGrid.vala', +- 'Widgets/InputMethod/LanguagesRow.vala', + 'Widgets/InputMethod/EnginesRow.vala', + 'Widgets/InputMethod/AddEnginesPopover.vala', + 'Views/Shortcuts.vala', +@@ -35,11 +34,6 @@ plug_files = files( + 'InputSources/SourceSettings.vala', + 'InputSources/InputSource.vala', + 'InputMethod/AddEnginesList.vala', +- 'InputMethod/Installer/UbuntuInstaller.vala', +- 'InputMethod/Installer/InstallList.vala', +- 'InputMethod/Installer/aptd-client.vala', +- 'Dialogs/ProgressDialog.vala', +- 'Dialogs/InstallEngineDialog.vala', + 'Dialogs/ConflictDialog.vala', + 'Dialogs/AddLayoutDialog.vala' + ) diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 4f44b337fd187..475503bfe4209 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja @@ -13,36 +12,25 @@ , libgee , libhandy , libcanberra-gtk3 -, python3 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-notifications"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "notifications"; rev = version; - sha256 = "sha256-i7fSKnP4W12cfax5IXm/Zgy5vP5z7S43S80gvzWpFCE="; + sha256 = "sha256-of7Tw38yJAhHKICU3XxGwIOwqfUhrL7SGKqFd9Dps/I="; }; - patches = [ - # Fix broken notification filter - # https://github.com/elementary/notifications/pull/207 - (fetchpatch { - url = "https://github.com/elementary/notifications/commit/4691ec869316be94598d8e55e1cd3bd525e8e149.patch"; - sha256 = "sha256-4x/Us92Mgws5v+ZQiKvjQ4ixfBnU8oTQ92rc+nf8Zdg="; - }) - ]; - nativeBuildInputs = [ glib # for glib-compile-schemas meson ninja pkg-config - python3 vala wrapGAppsHook ]; @@ -56,11 +44,6 @@ stdenv.mkDerivation rec { libhandy ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index 51e0737cfe813..b01db234fdd64 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "7.1.0"; + version = "7.1.1"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; rev = version; - sha256 = "sha256-uy/etQiJuaROw8bWg2PUdptNr4I8uqqUZ8BWK6D2bog="; + sha256 = "sha256-JZ2VYsNAjNGCzKOEhHCZx2uNLHFs+ktjFmROLHdFjX4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/assemblyscript/default.nix b/pkgs/development/compilers/assemblyscript/default.nix index a2b1954e645e5..a47d1f6bb74fc 100644 --- a/pkgs/development/compilers/assemblyscript/default.nix +++ b/pkgs/development/compilers/assemblyscript/default.nix @@ -5,13 +5,13 @@ buildNpmPackage rec { pname = "assemblyscript"; - version = "0.27.8"; + version = "0.27.9"; src = fetchFromGitHub { owner = "AssemblyScript"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EwpIUD9+IjJlWOnUEXgvx60i59ftQyHcPTQVWVoOGNQ="; + sha256 = "sha256-UOMWUM1wOhX2pR29DSYpPKLnjb1CWrKk6BtyXK7kqDk="; }; npmDepsHash = "sha256-9ILa1qY2GpP2RckcZYcCMmgCwdXIImOm+D8nldeoQL8="; diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix index 5b6d027914d7b..810a03152527e 100644 --- a/pkgs/development/compilers/julia/1.9.nix +++ b/pkgs/development/compilers/julia/1.9.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { done ''; - doInstallCheck = true; + doInstallCheck = !stdenv.hostPlatform.isAarch64; # tests are flaky for aarch64-linux on hydra installCheckTarget = "testall"; preInstallCheck = '' diff --git a/pkgs/development/compilers/llvm/15/libcxx/default.nix b/pkgs/development/compilers/llvm/15/libcxx/default.nix index 94374c8a312df..cc4e9bc830584 100644 --- a/pkgs/development/compilers/llvm/15/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxx/default.nix @@ -2,7 +2,7 @@ , monorepoSrc, runCommand , cmake, ninja, python3, fixDarwinDylibNames, version , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi -, libcxxabi, libcxxrt +, libcxxabi, libcxxrt, libunwind , enableShared ? !stdenv.hostPlatform.isStatic # If headersOnly is true, the resulting package would only include the headers. @@ -62,7 +62,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; + buildInputs = + lib.optionals (!headersOnly) [ cxxabi ] + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ]; cmakeFlags = let # See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string @@ -75,8 +77,18 @@ stdenv.mkDerivation rec { "-DLIBCXX_CXX_ABI=${if headersOnly then "none" else libcxx_cxx_abi_opt}" ] ++ lib.optional (!headersOnly && cxxabi.libName == "c++abi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1" ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" - ++ lib.optionals stdenv.hostPlatform.isWasm [ + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLIBCXX_USE_COMPILER_RT=ON" + # (Backport fix from 16, which has LIBCXX_ADDITIONAL_LIBRARIES, but 15 + # does not appear to) + # There's precedent for this in llvm-project/libcxx/cmake/caches. + # In a monorepo build you might do the following in the libcxxabi build: + # -DLLVM_ENABLE_PROJECTS=libcxxabi;libunwind + # -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=On + # libcxx appears to require unwind and doesn't pull it in via other means. + # "-DLIBCXX_ADDITIONAL_LIBRARIES=unwind" + "-DCMAKE_SHARED_LINKER_FLAGS=-lunwind" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" diff --git a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix index cb5fa44f07009..692a0256e901a 100644 --- a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -68,6 +68,13 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || + (stdenv.hostPlatform.isDarwin && enableShared)) [ + # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, + # but that does not appear to be the case for example when building + # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). + "-DCMAKE_EXE_LINKER_FLAGS=-nostdlib" + "-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" diff --git a/pkgs/development/compilers/llvm/15/libunwind/default.nix b/pkgs/development/compilers/llvm/15/libunwind/default.nix index dd14e2acaf869..1b677a7a2c0d7 100644 --- a/pkgs/development/compilers/llvm/15/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/15/libunwind/default.nix @@ -40,6 +40,11 @@ stdenv.mkDerivation rec { cd ../runtimes ''; + postInstall = lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) '' + # libcxxabi wants to link to libunwind_shared.so (?). + ln -s $out/lib/libunwind.so $out/lib/libunwind_shared.so + ''; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ninja python3 ]; diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix index aa248c0e60eba..fc0d7533c9949 100644 --- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix @@ -32,9 +32,16 @@ stdenv.mkDerivation { ++ lib.optional stdenv.isDarwin xcbuild.xcrun; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" - ]; + ] ++ lib.optionals (!haveLibc) [ + # The compiler got stricter about this, and there is a usellvm patch below + # which patches out the assert include causing an implicit definition of + # assert. It would be nicer to understand why compiler-rt thinks it should + # be able to #include <assert.h> in the first place; perhaps it's in the + # wrong, or perhaps there is a way to provide an assert.h. + "-Wno-error=implicit-function-declaration" + ]); cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" @@ -102,7 +109,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM && !haveLibc) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -117,6 +124,12 @@ stdenv.mkDerivation { '' + lib.optionalString (useLLVM) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o + # Note the history of crt{begin,end}S in previous versions of llvm in nixpkg: + # The presence of crtbegin_shared has been added and removed; it's possible + # people have added/removed it to get it working on their platforms. + # Try each in turn for now. + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtendS.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o '' + lib.optionalString doFakeLibgcc '' diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 0c0ff44e155f8..d9a363037a920 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -254,6 +254,14 @@ in let [ "-rtlib=compiler-rt" "-Wno-unused-command-line-argument" "-B${targetLlvmLibraries.compiler-rt}/lib" + + # Combat "__cxxabi_config.h not found". Maybe this could be fixed by + # copying these headers into libcxx? Note that building libcxx + # outside of monorepo isn't supported anymore, might be related to + # https://github.com/llvm/llvm-project/issues/55632 + # ("16.0.3 libcxx, libcxxabi: circular build dependencies") + # Looks like the machinery changed in https://reviews.llvm.org/D120727. + "-I${lib.getDev targetLlvmLibraries.libcxx.cxxabi}/include/c++/v1" ] ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" ++ lib.optional diff --git a/pkgs/development/compilers/llvm/16/libcxx/default.nix b/pkgs/development/compilers/llvm/16/libcxx/default.nix index 94374c8a312df..c387764b4f650 100644 --- a/pkgs/development/compilers/llvm/16/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxx/default.nix @@ -2,7 +2,7 @@ , monorepoSrc, runCommand , cmake, ninja, python3, fixDarwinDylibNames, version , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi -, libcxxabi, libcxxrt +, libcxxabi, libcxxrt, libunwind , enableShared ? !stdenv.hostPlatform.isStatic # If headersOnly is true, the resulting package would only include the headers. @@ -47,8 +47,6 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch ]; postPatch = '' @@ -62,7 +60,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; + buildInputs = + lib.optionals (!headersOnly) [ cxxabi ] + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ]; cmakeFlags = let # See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string @@ -75,8 +75,15 @@ stdenv.mkDerivation rec { "-DLIBCXX_CXX_ABI=${if headersOnly then "none" else libcxx_cxx_abi_opt}" ] ++ lib.optional (!headersOnly && cxxabi.libName == "c++abi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1" ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" - ++ lib.optionals stdenv.hostPlatform.isWasm [ + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLIBCXX_USE_COMPILER_RT=ON" + # There's precedent for this in llvm-project/libcxx/cmake/caches. + # In a monorepo build you might do the following in the libcxxabi build: + # -DLLVM_ENABLE_PROJECTS=libcxxabi;libunwinder + # -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=On + # libcxx appears to require unwind and doesn't pull it in via other means. + "-DLIBCXX_ADDITIONAL_LIBRARIES=unwind" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" diff --git a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index cb5fa44f07009..692a0256e901a 100644 --- a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -68,6 +68,13 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || + (stdenv.hostPlatform.isDarwin && enableShared)) [ + # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, + # but that does not appear to be the case for example when building + # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). + "-DCMAKE_EXE_LINKER_FLAGS=-nostdlib" + "-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" diff --git a/pkgs/development/compilers/llvm/16/libunwind/default.nix b/pkgs/development/compilers/llvm/16/libunwind/default.nix index dd14e2acaf869..1b677a7a2c0d7 100644 --- a/pkgs/development/compilers/llvm/16/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/16/libunwind/default.nix @@ -40,6 +40,11 @@ stdenv.mkDerivation rec { cd ../runtimes ''; + postInstall = lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) '' + # libcxxabi wants to link to libunwind_shared.so (?). + ln -s $out/lib/libunwind.so $out/lib/libunwind_shared.so + ''; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ninja python3 ]; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 8cf311e9b23ac..5ec5d35dcec51 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -313,6 +313,19 @@ in let # what stdenv we use here, as long as CMake is happy. cxx-headers = callPackage ./libcxx { inherit llvm_meta; + # Note that if we use the regular stdenv here we'll get cycle errors + # when attempting to use this compiler in the stdenv. + # + # The final stdenv pulls `cxx-headers` from the package set where + # hostPlatform *is* the target platform which means that `stdenv` at + # that point attempts to use this toolchain. + # + # So, we use `stdenv_` (the stdenv containing `clang` from this package + # set, defined below) to sidestep this issue. + # + # Because we only use `cxx-headers` in `libcxxabi` (which depends on the + # clang stdenv _anyways_), this is okay. + stdenv = stdenv_; headersOnly = true; }; diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index 94374c8a312df..f267b753b24ab 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -2,7 +2,7 @@ , monorepoSrc, runCommand , cmake, ninja, python3, fixDarwinDylibNames, version , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi -, libcxxabi, libcxxrt +, libcxxabi, libcxxrt, libunwind , enableShared ? !stdenv.hostPlatform.isStatic # If headersOnly is true, the resulting package would only include the headers. @@ -62,7 +62,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; + buildInputs = + lib.optionals (!headersOnly) [ cxxabi ] + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ]; + cmakeFlags = let # See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string @@ -75,8 +78,18 @@ stdenv.mkDerivation rec { "-DLIBCXX_CXX_ABI=${if headersOnly then "none" else libcxx_cxx_abi_opt}" ] ++ lib.optional (!headersOnly && cxxabi.libName == "c++abi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1" ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" - ++ lib.optionals stdenv.hostPlatform.isWasm [ + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLIBCXX_USE_COMPILER_RT=ON" + # (Backport fix from 16, which has LIBCXX_ADDITIONAL_LIBRARIES, but 15 + # does not appear to) + # There's precedent for this in llvm-project/libcxx/cmake/caches. + # In a monorepo build you might do the following in the libcxxabi build: + # -DLLVM_ENABLE_PROJECTS=libcxxabi;libunwinder + # -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=On + # libcxx appears to require unwind and doesn't pull it in via other means. + # "-DLIBCXX_ADDITIONAL_LIBRARIES=unwind" + "-DCMAKE_SHARED_LINKER_FLAGS=-lunwind" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 65c585181a702..51020fcdb0caf 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -68,6 +68,13 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || + (stdenv.hostPlatform.isDarwin && enableShared)) [ + # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, + # but that does not appear to be the case for example when building + # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). + "-DCMAKE_EXE_LINKER_FLAGS=-nostdlib" + "-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" diff --git a/pkgs/development/compilers/llvm/git/libunwind/default.nix b/pkgs/development/compilers/llvm/git/libunwind/default.nix index dd14e2acaf869..1b677a7a2c0d7 100644 --- a/pkgs/development/compilers/llvm/git/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/git/libunwind/default.nix @@ -40,6 +40,11 @@ stdenv.mkDerivation rec { cd ../runtimes ''; + postInstall = lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) '' + # libcxxabi wants to link to libunwind_shared.so (?). + ln -s $out/lib/libunwind.so $out/lib/libunwind_shared.so + ''; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ninja python3 ]; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index b964cf53d9e2d..e68ab90bf8e27 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib -, libarchive, db, pcre, libedit, libossp_uuid, libxcrypt,libXpm +, libarchive, db, pcre2, libedit, libossp_uuid, libxcrypt,libXpm , libSM, libXt, freetype, pkg-config, fontconfig , cmake, libyaml, Security , libjpeg, libX11, libXext, libXft, libXinerama @@ -59,7 +59,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ gmp readline openssl - libarchive libyaml db pcre libedit libossp_uuid libxcrypt + libarchive libyaml db pcre2 libedit libossp_uuid libxcrypt zlib ] ++ lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ] ++ extraLibraries diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 7a2ac1c7375b0..a0dbea04869ef 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://ziglang.org/"; changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.andrewrk ] ++ lib.teams.zig.members; + maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members; platforms = lib.platforms.unix; }; } // removeAttrs args [ "hash" ]) diff --git a/pkgs/development/compilers/zig/hook.nix b/pkgs/development/compilers/zig/hook.nix index 3d3e6f9ffee5a..788c432591ee7 100644 --- a/pkgs/development/compilers/zig/hook.nix +++ b/pkgs/development/compilers/zig/hook.nix @@ -11,12 +11,13 @@ makeSetupHook { substitutions = { zig_default_flags = let - cpu = "-Dcpu=baseline"; - releaseType = if lib.versionAtLeast zig.version "0.11" - then "-Doptimize=ReleaseSafe" - else "-Drelease-safe=true"; + releaseType = + if lib.versionAtLeast zig.version "0.11" then + "-Doptimize=ReleaseSafe" + else + "-Drelease-safe=true"; in - lib.concatStringsSep " " [ cpu releaseType ]; + [ "-Dcpu=baseline" releaseType ]; }; passthru = { inherit zig; }; diff --git a/pkgs/development/interpreters/rune/default.nix b/pkgs/development/interpreters/rune/default.nix new file mode 100644 index 0000000000000..944741a21b10d --- /dev/null +++ b/pkgs/development/interpreters/rune/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchCrate +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rune"; + version = "0.12.4"; + + src = fetchCrate { + pname = "rune-cli"; + inherit version; + hash = "sha256-Fw6vCy6EMLzNbhwOUwCCsGSueDxfh7KMjLhhbvTzclc="; + }; + + cargoHash = "sha256-F1FI7ZVNXIFzxIzimq0KXtGNWw26x1eQyqv+hVYaS1E="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + env = { + RUNE_VERSION = version; + }; + + meta = with lib; { + description = "An interpreter for the Rune Language, an embeddable dynamic programming language for Rust"; + homepage = "https://rune-rs.github.io/"; + changelog = "https://github.com/rune-rs/rune/releases/tag/${version}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "rune"; + }; +} diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 30e7e3556da14..2d1a87ab0b3ef 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "grantlee"; - version = "5.2.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "steveire"; repo = pname; rev = "v${version}"; - hash = "sha256-mAbgzdBdIW1wOTQNBePQuyTgkKdpn1c+zR3H7mXHvgk="; + hash = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/development/libraries/lcrq/default.nix b/pkgs/development/libraries/lcrq/default.nix index 8b35201798600..91a8e2e30f5be 100644 --- a/pkgs/development/libraries/lcrq/default.nix +++ b/pkgs/development/libraries/lcrq/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation (finalAttrs: { name = "lcrq"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "librecast"; repo = "lcrq"; rev = "v${finalAttrs.version}"; - hash = "sha256-s8+uTF6GQ76wG1zoAxqCaVT1J5Rd7vxPKX4zbQx6ro4="; + hash = "sha256-GvfmHST53qwVrztnmCzUVbVkgNGtAl5adqdNWOHItiU="; }; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/science/chemistry/dftd4/default.nix b/pkgs/development/libraries/science/chemistry/dftd4/default.nix index c9f00fa72ee61..52c9b4de20a55 100644 --- a/pkgs/development/libraries/science/chemistry/dftd4/default.nix +++ b/pkgs/development/libraries/science/chemistry/dftd4/default.nix @@ -14,13 +14,13 @@ assert !blas.isILP64 && !lapack.isILP64; stdenv.mkDerivation rec { pname = "dftd4"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "dftd4"; repo = pname; rev = "v${version}"; - hash = "sha256-ZCoFbjTNQD7slq5sKwPRPkrHSHofsxU9C9h/bF5jmZI="; + hash = "sha256-VIV9953hx0MZupOARdH+P1h7JtZeJmTlqtO8si+lwdU="; }; nativeBuildInputs = [ cmake gfortran ]; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index 155e863bf21e4..2eb391dda46bf 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -2,24 +2,25 @@ , backendStdenv , fetchFromGitHub , which -, cudaPackages ? { } -, addOpenGLRunpath +, autoAddOpenGLRunpathHook +, cuda_cccl +, cuda_cudart +, cuda_nvcc +, cudaFlags +, cudaVersion }: - -with cudaPackages; - let # Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86" gencode = lib.concatStringsSep " " cudaFlags.gencode; in -backendStdenv.mkDerivation rec { - name = "nccl-${version}-cuda-${cudaPackages.cudaMajorVersion}"; +backendStdenv.mkDerivation (finalAttrs: { + name = "nccl-${finalAttrs.version}-cuda-${cudaVersion}"; version = "2.16.5-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-JyhhYKSVIqUKIbC1rCJozPT1IrIyRLGrTjdPjJqsYaU="; }; @@ -27,13 +28,18 @@ backendStdenv.mkDerivation rec { nativeBuildInputs = [ which - addOpenGLRunpath + autoAddOpenGLRunpathHook cuda_nvcc ]; buildInputs = [ cuda_cudart - ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0.0") [ + ] + # NOTE: CUDA versions in Nixpkgs only use a major and minor version. When we do comparisons + # against other version, like below, it's important that we use the same format. Otherwise, + # we'll get incorrect results. + # For example, lib.versionAtLeast "12.0" "12.0.0" == false. + ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ cuda_cccl ]; @@ -46,27 +52,19 @@ backendStdenv.mkDerivation rec { makeFlags = [ "CUDA_HOME=${cuda_nvcc}" - "CUDA_LIB=${cuda_cudart}/lib64" - "CUDA_INC=${cuda_cudart}/include" + "CUDA_LIB=${lib.getLib cuda_cudart}/lib" + "CUDA_INC=${lib.getDev cuda_cudart}/include" "PREFIX=$(out)" ]; postFixup = '' moveToOutput lib/libnccl_static.a $dev - - # Set RUNPATH so that libnvidia-ml in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - addOpenGLRunpath $out/lib/lib*.so ''; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ]; enableParallelBuilding = true; - passthru = { - inherit cudaPackages; - }; - meta = with lib; { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; homepage = "https://developer.nvidia.com/nccl"; @@ -74,4 +72,4 @@ backendStdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mdaiter orivej ]; }; -} +}) diff --git a/pkgs/development/mobile/cordova/default.nix b/pkgs/development/mobile/cordova/default.nix new file mode 100644 index 0000000000000..0a4fec58c2c56 --- /dev/null +++ b/pkgs/development/mobile/cordova/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "cordova"; + version = "12.0.0"; + + src = fetchFromGitHub { + owner = "apache"; + repo = "cordova-cli"; + rev = version; + hash = "sha256-fEV7NlRcRpyeRplsdXHI2U4/89DsvKQpVwHD5juiNPo="; + }; + + npmDepsHash = "sha256-ZMxZiwCgqzOBwDXeTfIEwqFVdM9ysWeE5AbX7rUdwIc="; + + dontNpmBuild = true; + + meta = { + description = "Build native mobile applications using HTML, CSS and JavaScript"; + homepage = "https://github.com/apache/cordova-cli"; + license = lib.licenses.asl20; + mainProgram = "cordova"; + maintainers = with lib.maintainers; [ flosse ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 55ebe329d88f2..20f20b920cb53 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -49,23 +49,31 @@ mapAliases { balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 + inherit (pkgs) btc-rpc-explorer; # added 2023-08-17 + inherit (pkgs) carbon-now-cli; # added 2023-08-17 inherit (pkgs) carto; # added 2023-08-17 castnow = pkgs.castnow; # added 2023-07-30 inherit (pkgs) clean-css-cli; # added 2023-08-18 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 + inherit (pkgs) cordova; # added 2023-08-18 eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; eslint_d = pkgs.eslint_d; # Added 2023-05-26 + inherit (pkgs) firebase-tools; # added 2023-08-18 flood = pkgs.flood; # Added 2023-07-25 + inherit (pkgs) graphqurl; # added 2023-08-19 gtop = pkgs.gtop; # added 2023-07-31 inherit (pkgs) htmlhint; # added 2023-08-19 hueadm = pkgs.hueadm; # added 2023-07-31 + inherit (pkgs) hyperpotamus; # added 2023-08-19 immich = pkgs.immich-cli; # added 2023-08-19 indium = throw "indium was removed because it was broken"; # added 2023-08-19 + ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 karma = pkgs.karma-runner; # added 2023-07-29 manta = pkgs.node-manta; # Added 2023-05-06 markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 + inherit (pkgs) markdownlint-cli2; # added 2023-08-22 readability-cli = pkgs.readability-cli; # Added 2023-06-12 reveal-md = pkgs.reveal-md; # added 2023-07-31 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 7bc78c62399c3..55856bc3a9792 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -29,7 +29,6 @@ "@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen"; "@webassemblyjs/wast-refmt-1.11.1" = "wast-refmt"; aws-cdk = "cdk"; - carbon-now-cli = "carbon-now"; cdk8s-cli = "cdk8s"; cdktf-cli = "cdktf"; clipboard-cli = "clipboard"; @@ -40,7 +39,6 @@ dockerfile-language-server-nodejs = "docker-langserver"; fast-cli = "fast"; fauna-shell = "fauna"; - firebase-tools = "firebase"; fkill-cli = "fkill"; fleek-cli = "fleek"; git-run = "gr"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2d891a114df57..17081709481c4 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -39,8 +39,6 @@ , "bower2nix" , "browserify" , "browser-sync" -, "btc-rpc-explorer" -, "carbon-now-cli" , "cdk8s-cli" , "cdktf-cli" , "clipboard-cli" @@ -100,7 +98,6 @@ , "coinmon" , "concurrently" , "conventional-changelog-cli" -, "cordova" , "cpy-cli" , "create-cycle-app" , "create-react-app" @@ -127,7 +124,6 @@ , "expo-cli" , "fast-cli" , "fauna-shell" -, "firebase-tools" , "fixjson" , "fkill-cli" , "fleek-cli" @@ -148,7 +144,6 @@ , "graphql" , "graphql-cli" , "graphql-language-service-cli" -, "graphqurl" , "grunt-cli" , "makam" , "meshcommander" @@ -161,13 +156,11 @@ , "hsd" , "hs-airdrop" , "hs-client" -, "hyperpotamus" , "ijavascript" , "inliner" , "imapnotify" , "insect" , "intelephense" -, "ionic" , "jake" , "joplin" , "js-beautify" @@ -196,7 +189,6 @@ , "lua-fmt" , "lv_font_conv" , "madoko" -, "markdownlint-cli2" , "markdown-link-check" , {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"} , "mastodon-bot" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c68dddcf5b270..29778dddc6b4f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -89710,1290 +89710,6 @@ in bypassCache = true; reconstructLock = true; }; - btc-rpc-explorer = nodeEnv.buildNodePackage { - name = "btc-rpc-explorer"; - packageName = "btc-rpc-explorer"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-3.4.0.tgz"; - sha512 = "+ha8oXxW7ZjbsSv7q/NFPtZNABjFcyVrpUWQ6KeBtZroidRET1e7WLiH4olT/FTulJcL8mD7ZVMNOkRyhA+8Dg=="; - }; - dependencies = [ - (sources."@aws-crypto/crc32-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/crc32c-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/ie11-detection-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/sha1-browser-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/sha256-browser-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/sha256-js-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/supports-web-crypto-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/util-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - sources."@aws-sdk/client-cognito-identity-3.388.0" - sources."@aws-sdk/client-s3-3.388.0" - sources."@aws-sdk/client-sso-3.387.0" - sources."@aws-sdk/client-sts-3.388.0" - sources."@aws-sdk/credential-provider-cognito-identity-3.388.0" - sources."@aws-sdk/credential-provider-env-3.387.0" - sources."@aws-sdk/credential-provider-ini-3.388.0" - sources."@aws-sdk/credential-provider-node-3.388.0" - sources."@aws-sdk/credential-provider-process-3.387.0" - sources."@aws-sdk/credential-provider-sso-3.388.0" - sources."@aws-sdk/credential-provider-web-identity-3.387.0" - sources."@aws-sdk/credential-providers-3.388.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.387.0" - sources."@aws-sdk/middleware-expect-continue-3.387.0" - sources."@aws-sdk/middleware-flexible-checksums-3.387.0" - sources."@aws-sdk/middleware-host-header-3.387.0" - sources."@aws-sdk/middleware-location-constraint-3.387.0" - sources."@aws-sdk/middleware-logger-3.387.0" - sources."@aws-sdk/middleware-recursion-detection-3.387.0" - sources."@aws-sdk/middleware-sdk-s3-3.387.0" - sources."@aws-sdk/middleware-sdk-sts-3.387.0" - sources."@aws-sdk/middleware-signing-3.387.0" - sources."@aws-sdk/middleware-ssec-3.387.0" - sources."@aws-sdk/middleware-user-agent-3.387.0" - sources."@aws-sdk/signature-v4-crt-3.387.0" - sources."@aws-sdk/signature-v4-multi-region-3.387.0" - sources."@aws-sdk/token-providers-3.388.0" - sources."@aws-sdk/types-3.387.0" - sources."@aws-sdk/util-arn-parser-3.310.0" - sources."@aws-sdk/util-endpoints-3.387.0" - sources."@aws-sdk/util-locate-window-3.310.0" - sources."@aws-sdk/util-user-agent-browser-3.387.0" - sources."@aws-sdk/util-user-agent-node-3.387.0" - sources."@aws-sdk/util-utf8-browser-3.259.0" - sources."@aws-sdk/xml-builder-3.310.0" - sources."@babel/code-frame-7.22.10" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.5" - sources."@babel/highlight-7.22.10" - sources."@babel/parser-7.22.10" - sources."@babel/types-7.22.10" - sources."@httptoolkit/websocket-stream-6.0.1" - (sources."@janoside/app-utils-git+https://github.com/janoside/app-utils#0f52c7028951c1c2b67b06b2ce50fd74001bba93" // { - dependencies = [ - sources."dotenv-16.3.1" - ]; - }) - sources."@kurkle/color-0.3.2" - sources."@kwsites/file-exists-1.1.1" - sources."@kwsites/promise-deferred-1.1.1" - sources."@mongodb-js/zstd-1.1.0" - sources."@mongodb-js/zstd-darwin-arm64-1.1.0" - sources."@mongodb-js/zstd-darwin-x64-1.1.0" - sources."@mongodb-js/zstd-linux-arm64-gnu-1.1.0" - sources."@mongodb-js/zstd-linux-arm64-musl-1.1.0" - sources."@mongodb-js/zstd-linux-x64-gnu-1.1.0" - sources."@mongodb-js/zstd-linux-x64-musl-1.1.0" - sources."@mongodb-js/zstd-win32-x64-msvc-1.1.0" - sources."@napi-rs/snappy-android-arm-eabi-7.2.2" - sources."@napi-rs/snappy-android-arm64-7.2.2" - sources."@napi-rs/snappy-darwin-arm64-7.2.2" - sources."@napi-rs/snappy-darwin-x64-7.2.2" - sources."@napi-rs/snappy-freebsd-x64-7.2.2" - sources."@napi-rs/snappy-linux-arm-gnueabihf-7.2.2" - sources."@napi-rs/snappy-linux-arm64-gnu-7.2.2" - sources."@napi-rs/snappy-linux-arm64-musl-7.2.2" - sources."@napi-rs/snappy-linux-x64-gnu-7.2.2" - sources."@napi-rs/snappy-linux-x64-musl-7.2.2" - sources."@napi-rs/snappy-win32-arm64-msvc-7.2.2" - sources."@napi-rs/snappy-win32-ia32-msvc-7.2.2" - sources."@napi-rs/snappy-win32-x64-msvc-7.2.2" - sources."@noble/hashes-1.3.1" - sources."@popperjs/core-2.11.8" - sources."@redis/bloom-1.2.0" - sources."@redis/client-1.5.8" - sources."@redis/graph-1.1.0" - sources."@redis/json-1.0.4" - sources."@redis/search-1.1.3" - sources."@redis/time-series-1.0.4" - sources."@scure/base-1.1.1" - sources."@smithy/abort-controller-2.0.2" - sources."@smithy/chunked-blob-reader-2.0.0" - sources."@smithy/chunked-blob-reader-native-2.0.0" - sources."@smithy/config-resolver-2.0.2" - sources."@smithy/credential-provider-imds-2.0.2" - sources."@smithy/eventstream-codec-2.0.2" - sources."@smithy/eventstream-serde-browser-2.0.2" - sources."@smithy/eventstream-serde-config-resolver-2.0.2" - sources."@smithy/eventstream-serde-node-2.0.2" - sources."@smithy/eventstream-serde-universal-2.0.2" - sources."@smithy/fetch-http-handler-2.0.2" - sources."@smithy/hash-blob-browser-2.0.2" - sources."@smithy/hash-node-2.0.2" - sources."@smithy/hash-stream-node-2.0.2" - sources."@smithy/invalid-dependency-2.0.2" - sources."@smithy/is-array-buffer-2.0.0" - sources."@smithy/md5-js-2.0.2" - sources."@smithy/middleware-content-length-2.0.2" - sources."@smithy/middleware-endpoint-2.0.2" - sources."@smithy/middleware-retry-2.0.2" - sources."@smithy/middleware-serde-2.0.2" - sources."@smithy/middleware-stack-2.0.0" - sources."@smithy/node-config-provider-2.0.2" - sources."@smithy/node-http-handler-2.0.2" - sources."@smithy/property-provider-2.0.2" - sources."@smithy/protocol-http-2.0.2" - sources."@smithy/querystring-builder-2.0.2" - sources."@smithy/querystring-parser-2.0.2" - sources."@smithy/service-error-classification-2.0.0" - sources."@smithy/shared-ini-file-loader-2.0.2" - sources."@smithy/signature-v4-2.0.2" - sources."@smithy/smithy-client-2.0.2" - sources."@smithy/types-2.1.0" - sources."@smithy/url-parser-2.0.2" - sources."@smithy/util-base64-2.0.0" - sources."@smithy/util-body-length-browser-2.0.0" - sources."@smithy/util-body-length-node-2.0.0" - sources."@smithy/util-buffer-from-2.0.0" - sources."@smithy/util-config-provider-2.0.0" - sources."@smithy/util-defaults-mode-browser-2.0.2" - sources."@smithy/util-defaults-mode-node-2.0.2" - sources."@smithy/util-hex-encoding-2.0.0" - sources."@smithy/util-middleware-2.0.0" - sources."@smithy/util-retry-2.0.0" - sources."@smithy/util-stream-2.0.2" - sources."@smithy/util-uri-escape-2.0.0" - sources."@smithy/util-utf8-2.0.0" - sources."@smithy/util-waiter-2.0.2" - sources."@types/connect-3.4.35" - sources."@types/minimist-1.2.2" - sources."@types/node-20.4.9" - sources."@types/normalize-package-data-2.4.1" - sources."@types/webidl-conversions-7.0.0" - sources."@types/whatwg-url-8.2.2" - sources."@types/ws-8.5.5" - sources."JSONStream-1.3.5" - sources."accepts-1.3.8" - sources."acorn-7.4.1" - sources."agent-base-6.0.2" - sources."ansi-regex-5.0.1" - (sources."ansi-styles-3.2.1" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) - sources."argparse-2.0.1" - sources."array-flatten-1.1.1" - sources."arrify-1.0.1" - sources."asap-2.0.6" - sources."assert-never-1.2.1" - sources."async-3.2.4" - sources."asynckit-0.4.0" - (sources."aws-crt-1.17.1" // { - dependencies = [ - sources."axios-0.24.0" - ]; - }) - sources."axios-1.4.0" - sources."babel-walk-3.0.0-canary-5" - sources."balanced-match-1.0.2" - sources."base-x-3.0.9" - sources."base64-js-1.5.1" - (sources."basic-auth-2.0.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."bech32-2.0.0" - sources."bignumber.js-9.1.1" - sources."bindings-1.5.0" - sources."bip174-2.1.0" - sources."bip32-4.0.0" - sources."bitcoinjs-lib-6.1.3" - (sources."bl-4.1.0" // { - dependencies = [ - sources."buffer-5.7.1" - sources."readable-stream-3.6.2" - ]; - }) - (sources."body-parser-1.20.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."iconv-lite-0.4.24" - ]; - }) - sources."bootstrap-5.3.1" - sources."bowser-2.11.0" - sources."brace-expansion-1.1.11" - sources."bs58-4.0.1" - (sources."bs58check-3.0.1" // { - dependencies = [ - sources."base-x-4.0.0" - sources."bs58-5.0.0" - ]; - }) - sources."bson-5.4.0" - sources."buffer-6.0.3" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" - sources."bytes-3.1.2" - sources."call-bind-1.0.2" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."chalk-2.4.2" - sources."character-parser-2.2.0" - sources."charenc-0.0.2" - sources."chart.js-4.3.3" - sources."chownr-1.1.4" - sources."cipher-base-1.0.4" - sources."cliui-6.0.0" - sources."cluster-key-slot-1.1.2" - sources."color-4.2.3" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-string-1.9.1" - sources."combined-stream-1.0.8" - sources."commander-2.20.3" - sources."commist-1.1.0" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."bytes-3.0.0" - sources."debug-2.6.9" - sources."safe-buffer-5.1.2" - ]; - }) - sources."concat-map-0.0.1" - (sources."concat-stream-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."constantinople-4.0.1" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."cookie-0.4.1" - sources."cookie-parser-1.4.6" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."create-hash-1.2.0" - sources."crypt-0.0.2" - sources."crypto-js-4.1.1" - sources."csrf-3.1.0" - (sources."csurf-1.11.0" // { - dependencies = [ - sources."cookie-0.4.0" - sources."depd-1.1.2" - sources."http-errors-1.7.3" - sources."setprototypeof-1.1.1" - sources."statuses-1.5.0" - sources."toidentifier-1.0.0" - ]; - }) - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."decamelize-1.2.0" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."map-obj-1.0.1" - ]; - }) - sources."decimal.js-10.4.3" - sources."decompress-response-6.0.0" - sources."deep-extend-0.6.0" - sources."delay-5.0.0" - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."detect-libc-2.0.2" - sources."dijkstrajs-1.0.3" - sources."doctypes-1.1.0" - sources."dotenv-13.0.1" - sources."duplexify-3.7.1" - sources."ee-first-1.1.1" - sources."electrum-client-git+https://github.com/janoside/electrum-client" - sources."emoji-regex-8.0.0" - sources."encode-utf8-1.0.3" - sources."encodeurl-1.0.2" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."entities-3.0.1" - (sources."error-ex-1.3.2" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."etag-1.8.1" - sources."event-loop-stats-1.4.1" - sources."expand-template-2.0.3" - (sources."express-4.18.2" // { - dependencies = [ - sources."body-parser-1.20.1" - sources."cookie-0.5.0" - sources."debug-2.6.9" - sources."iconv-lite-0.4.24" - sources."raw-body-2.5.1" - ]; - }) - sources."express-async-handler-1.2.0" - (sources."express-session-1.17.3" // { - dependencies = [ - sources."cookie-0.4.2" - sources."debug-2.6.9" - ]; - }) - sources."extend-3.0.2" - sources."eyes-0.1.8" - sources."fast-xml-parser-4.2.5" - sources."file-uri-to-path-1.0.0" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."find-up-4.1.0" - sources."follow-redirects-1.15.2" - sources."form-data-4.0.0" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-constants-1.0.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."gaxios-5.1.3" - sources."gcp-metadata-5.3.0" - sources."generic-pool-3.9.0" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" - sources."github-from-package-0.0.0" - sources."glob-7.2.3" - sources."hard-rejection-2.1.0" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - (sources."help-me-3.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - (sources."hosted-git-info-4.1.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."http-errors-2.0.0" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."ip-2.0.0" - sources."ipaddr.js-1.9.1" - sources."is-arrayish-0.3.2" - sources."is-buffer-1.1.6" - sources."is-core-module-2.13.0" - sources."is-expression-4.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."is-plain-obj-1.1.0" - sources."is-promise-2.2.2" - sources."is-regex-1.1.4" - sources."is-stream-2.0.1" - sources."isarray-1.0.0" - sources."isomorphic-ws-4.0.1" - (sources."jayson-4.1.0" // { - dependencies = [ - sources."@types/node-12.20.55" - sources."@types/ws-7.4.7" - sources."utf-8-validate-5.0.10" - sources."ws-7.5.9" - ]; - }) - sources."js-sdsl-4.3.0" - sources."js-stringify-1.0.2" - sources."js-tokens-4.0.0" - sources."json-bigint-1.0.0" - sources."json-parse-even-better-errors-2.3.1" - sources."json-stringify-safe-5.0.1" - sources."jsonparse-1.3.1" - sources."jstransformer-1.0.0" - sources."kerberos-2.0.1" - sources."kind-of-6.0.3" - sources."leven-2.1.0" - sources."lines-and-columns-1.2.4" - sources."linkify-it-4.0.1" - sources."locate-path-5.0.0" - sources."lru-cache-9.1.2" - sources."luxon-3.4.0" - sources."map-obj-4.3.0" - sources."markdown-it-13.0.1" - sources."md5-2.3.0" - sources."md5.js-1.3.5" - sources."mdurl-1.0.1" - sources."media-typer-0.3.0" - sources."memory-pager-1.5.0" - (sources."memorystore-1.6.7" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) - sources."meow-9.0.0" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-3.1.0" - sources."min-indent-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minimist-options-4.1.0" - sources."mkdirp-classic-0.5.3" - sources."moment-2.29.4" - sources."moment-duration-format-2.3.2" - sources."mongodb-5.7.0" - sources."mongodb-client-encryption-2.9.0" - sources."mongodb-connection-string-url-2.6.0" - (sources."morgan-1.10.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."on-finished-2.3.0" - ]; - }) - (sources."mqtt-4.3.7" // { - dependencies = [ - sources."duplexify-4.1.2" - sources."lru-cache-6.0.0" - sources."readable-stream-3.6.2" - sources."utf-8-validate-5.0.10" - sources."ws-7.5.9" - ]; - }) - sources."mqtt-packet-6.10.0" - sources."ms-2.0.0" - sources."nan-2.17.0" - sources."napi-build-utils-1.0.2" - sources."negotiator-0.6.3" - sources."node-abi-3.45.0" - sources."node-addon-api-4.3.0" - (sources."node-fetch-2.6.12" // { - dependencies = [ - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - }) - sources."node-gyp-build-4.6.0" - sources."normalize-package-data-3.0.3" - sources."number-allocator-1.0.14" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."parse-json-5.2.0" - sources."parseurl-1.3.3" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" - sources."pidusage-3.0.2" - sources."pngjs-5.0.0" - sources."prebuild-install-7.1.1" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."promise-7.3.1" - sources."proxy-addr-2.0.7" - sources."proxy-from-env-1.1.0" - sources."pseudomap-1.0.2" - sources."pug-3.0.2" - sources."pug-attrs-3.0.0" - sources."pug-code-gen-3.0.2" - sources."pug-error-2.0.0" - sources."pug-filters-4.0.0" - sources."pug-lexer-5.0.1" - sources."pug-linker-4.0.0" - sources."pug-load-3.0.0" - sources."pug-parser-6.0.0" - sources."pug-runtime-3.0.1" - sources."pug-strip-comments-2.0.0" - sources."pug-walk-2.0.0" - sources."pump-3.0.0" - sources."punycode-2.3.0" - sources."qrcode-1.5.3" - sources."qs-6.11.0" - sources."quick-lru-4.0.1" - sources."random-bytes-1.0.0" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.2" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."rc-1.2.8" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."semver-5.7.2" - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - }) - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."redent-3.0.0" - sources."redis-4.6.7" - sources."reinterval-1.1.0" - sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."resolve-1.22.4" - sources."rfdc-1.3.0" - sources."ripemd160-2.0.2" - sources."rndm-1.2.0" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."saslprep-1.0.3" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - (sources."serve-favicon-2.5.0" // { - dependencies = [ - sources."ms-2.1.1" - sources."safe-buffer-5.1.1" - ]; - }) - sources."serve-static-1.15.0" - sources."set-blocking-2.0.0" - sources."setprototypeof-1.2.0" - sources."sha.js-2.4.11" - (sources."sharp-0.31.3" // { - dependencies = [ - sources."node-addon-api-5.1.0" - ]; - }) - sources."side-channel-1.0.4" - sources."simple-concat-1.0.1" - sources."simple-get-4.0.1" - sources."simple-git-3.19.1" - sources."simple-swizzle-0.2.2" - sources."smart-buffer-4.2.0" - sources."snappy-7.2.2" - sources."socks-2.7.1" - sources."sparse-bitfield-3.0.3" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - (sources."split2-3.2.2" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."statuses-2.0.1" - sources."stream-shift-1.0.1" - sources."string-width-4.2.3" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."strip-ansi-6.0.1" - sources."strip-indent-3.0.0" - sources."strip-json-comments-2.0.1" - sources."strnum-1.0.5" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."tar-fs-2.1.1" - (sources."tar-stream-2.2.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."through-2.3.8" - sources."tiny-secp256k1-2.2.3" - sources."to-fast-properties-2.0.0" - sources."toidentifier-1.0.1" - sources."token-stream-1.0.0" - sources."tr46-3.0.0" - sources."trim-newlines-3.0.1" - sources."tslib-2.6.1" - sources."tsscmp-1.0.6" - sources."tunnel-agent-0.6.0" - sources."type-fest-0.18.1" - sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."typeforce-1.18.0" - sources."uc.micro-1.0.6" - sources."uid-safe-2.1.5" - sources."uint8array-tools-0.0.7" - sources."unpipe-1.0.0" - sources."utf-8-validate-6.0.3" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."validate-npm-package-license-3.0.4" - sources."varuint-bitcoin-1.1.2" - sources."vary-1.1.2" - sources."void-elements-3.1.0" - sources."webidl-conversions-7.0.0" - sources."whatwg-url-11.0.0" - sources."which-module-2.0.1" - (sources."wif-2.0.6" // { - dependencies = [ - sources."bs58check-2.1.2" - ]; - }) - sources."with-7.0.2" - (sources."wrap-ansi-6.2.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) - sources."wrappy-1.0.2" - sources."ws-8.13.0" - sources."xtend-4.0.2" - sources."y18n-4.0.3" - sources."yallist-4.0.0" - (sources."yargs-15.4.1" // { - dependencies = [ - sources."yargs-parser-18.1.3" - ]; - }) - sources."yargs-parser-20.2.9" - sources."zeromq-5.3.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Open-source, self-hosted Bitcoin explorer"; - homepage = "https://github.com/janoside/btc-rpc-explorer#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - carbon-now-cli = nodeEnv.buildNodePackage { - name = "carbon-now-cli"; - packageName = "carbon-now-cli"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/carbon-now-cli/-/carbon-now-cli-2.0.0.tgz"; - sha512 = "nad2waGHrt4ISKU3VAPdf+cyeXdPRVuNmJSQtLD4KSNcPwR3wqpgCo7Y4PBZYdYU+E0IRSaS5a1QfIU25Inqxw=="; - }; - dependencies = [ - (sources."@babel/code-frame-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.5" - (sources."@babel/highlight-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - (sources."@babel/runtime-7.22.10" // { - dependencies = [ - sources."regenerator-runtime-0.14.0" - ]; - }) - sources."@jimp/bmp-0.14.0" - sources."@jimp/core-0.14.0" - sources."@jimp/custom-0.14.0" - sources."@jimp/gif-0.14.0" - sources."@jimp/jpeg-0.14.0" - sources."@jimp/plugin-blit-0.14.0" - sources."@jimp/plugin-blur-0.14.0" - sources."@jimp/plugin-circle-0.14.0" - sources."@jimp/plugin-color-0.14.0" - sources."@jimp/plugin-contain-0.14.0" - sources."@jimp/plugin-cover-0.14.0" - sources."@jimp/plugin-crop-0.14.0" - sources."@jimp/plugin-displace-0.14.0" - sources."@jimp/plugin-dither-0.14.0" - sources."@jimp/plugin-fisheye-0.14.0" - sources."@jimp/plugin-flip-0.14.0" - sources."@jimp/plugin-gaussian-0.14.0" - sources."@jimp/plugin-invert-0.14.0" - sources."@jimp/plugin-mask-0.14.0" - sources."@jimp/plugin-normalize-0.14.0" - sources."@jimp/plugin-print-0.14.0" - sources."@jimp/plugin-resize-0.14.0" - sources."@jimp/plugin-rotate-0.14.0" - sources."@jimp/plugin-scale-0.14.0" - sources."@jimp/plugin-shadow-0.14.0" - sources."@jimp/plugin-threshold-0.14.0" - sources."@jimp/plugins-0.14.0" - sources."@jimp/png-0.14.0" - sources."@jimp/tiff-0.14.0" - sources."@jimp/types-0.14.0" - sources."@jimp/utils-0.14.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@playwright/test-1.36.2" - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/minimist-1.2.2" - sources."@types/node-20.4.9" - sources."@types/normalize-package-data-2.4.1" - sources."@xmldom/xmldom-0.8.10" - sources."aggregate-error-3.1.0" - (sources."ansi-align-3.0.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."ansi-colors-4.1.3" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.1" - sources."ansi-styles-4.3.0" - sources."any-base-1.1.0" - (sources."app-path-3.3.0" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."execa-1.0.0" - sources."get-stream-4.1.0" - sources."is-stream-1.1.0" - sources."npm-run-path-2.0.2" - sources."path-key-2.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - }) - sources."arch-2.2.0" - sources."array-range-1.0.1" - sources."array-union-2.1.0" - sources."arrify-1.0.1" - sources."astral-regex-2.0.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bmp-js-0.1.0" - (sources."boxen-7.1.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."camelcase-7.0.1" - sources."chalk-5.3.0" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."type-fest-2.19.0" - ]; - }) - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."buffer-equal-0.0.1" - sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."ci-info-3.8.0" - sources."clean-stack-2.2.0" - sources."cli-boxes-3.0.0" - sources."cli-cursor-2.1.0" - (sources."cli-truncate-3.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."cli-width-2.2.1" - sources."clipboard-sys-1.2.1" - (sources."clipboardy-2.3.0" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."execa-1.0.0" - sources."get-stream-4.1.0" - sources."is-stream-1.1.0" - sources."npm-run-path-2.0.2" - sources."path-key-2.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."colorette-2.0.20" - sources."concat-map-0.0.1" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - (sources."configstore-6.0.0" // { - dependencies = [ - sources."crypto-random-string-4.0.0" - sources."unique-string-3.0.0" - ]; - }) - sources."cross-spawn-7.0.3" - sources."crypto-random-string-2.0.0" - sources."cycled-1.2.0" - sources."decamelize-1.2.0" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."map-obj-1.0.1" - ]; - }) - sources."decode-gif-1.0.1" - sources."decode-uri-component-0.2.2" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - sources."defer-to-connect-2.0.1" - sources."define-lazy-prop-2.0.0" - sources."del-6.1.1" - sources."delay-4.4.1" - sources."dir-glob-3.0.1" - sources."dom-walk-0.1.2" - sources."dot-prop-6.0.1" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."end-of-stream-1.4.4" - (sources."enquirer-2.4.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) - sources."error-ex-1.3.2" - sources."escape-goat-4.0.0" - sources."escape-string-regexp-1.0.5" - sources."eventemitter3-5.0.1" - sources."execa-5.1.1" - sources."exif-parser-0.1.12" - sources."external-editor-3.1.0" - sources."fast-glob-3.3.1" - sources."fastq-1.15.0" - sources."figures-2.0.0" - sources."file-exists-5.0.1" - sources."file-extension-4.0.5" - sources."file-type-9.0.0" - sources."fill-range-7.0.1" - sources."filter-obj-1.1.0" - sources."find-up-4.1.0" - sources."form-data-encoder-2.1.4" - sources."fs-extra-10.1.0" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."get-stdin-8.0.0" - sources."get-stream-6.0.1" - sources."gifwrap-0.9.4" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."global-4.4.0" - sources."global-dirs-3.0.1" - sources."globby-11.1.0" - sources."got-12.6.1" - sources."graceful-fs-4.2.11" - sources."hard-rejection-2.1.0" - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."has-yarn-3.0.0" - sources."hosted-git-info-4.1.0" - sources."http-cache-semantics-4.1.1" - (sources."http2-wrapper-2.2.0" // { - dependencies = [ - sources."quick-lru-5.1.1" - ]; - }) - sources."human-signals-2.1.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - (sources."image-q-4.0.0" // { - dependencies = [ - sources."@types/node-16.9.1" - ]; - }) - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-2.0.0" - (sources."inquirer-6.5.2" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."is-arrayish-0.2.1" - sources."is-ci-3.0.1" - sources."is-core-module-2.13.0" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-function-1.0.2" - sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-npm-6.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.3" - sources."is-plain-obj-1.1.0" - sources."is-stream-2.0.1" - sources."is-typedarray-1.0.0" - sources."is-wsl-2.2.0" - sources."is-yarn-global-0.4.1" - sources."isexe-2.0.0" - sources."iterm2-version-4.2.0" - sources."jimp-0.14.0" - sources."jpeg-js-0.4.4" - sources."js-tokens-4.0.0" - sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-2.3.1" - sources."jsonfile-6.1.0" - sources."keyv-4.5.3" - sources."kind-of-6.0.3" - sources."latest-version-7.0.0" - sources."lines-and-columns-1.2.4" - sources."listr2-6.6.1" - sources."load-bmfont-1.4.1" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - (sources."log-update-5.0.1" // { - dependencies = [ - sources."ansi-escapes-5.0.0" - sources."ansi-regex-6.0.1" - sources."cli-cursor-4.0.0" - sources."restore-cursor-4.0.0" - sources."strip-ansi-7.1.0" - ]; - }) - sources."lowercase-keys-3.0.0" - sources."lru-cache-6.0.0" - sources."map-obj-4.3.0" - (sources."meow-9.0.0" // { - dependencies = [ - sources."type-fest-0.18.1" - ]; - }) - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mime-1.6.0" - sources."mimic-fn-2.1.0" - sources."mimic-response-4.0.0" - sources."min-document-2.19.0" - sources."min-indent-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minimist-options-4.1.0" - sources."mkdirp-0.5.6" - sources."mute-stream-0.0.7" - sources."nanoid-3.3.6" - sources."nice-try-1.0.5" - (sources."normalize-package-data-3.0.3" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - sources."normalize-url-8.0.0" - sources."npm-run-path-4.0.1" - sources."omggif-1.0.10" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.2" - sources."os-tmpdir-1.0.2" - sources."p-cancelable-3.0.0" - sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-4.0.0" - sources."p-try-2.2.0" - (sources."package-json-8.1.1" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - sources."pako-1.0.11" - sources."parse-bmfont-ascii-1.0.6" - sources."parse-bmfont-binary-1.0.6" - sources."parse-bmfont-xml-1.1.4" - sources."parse-headers-2.0.5" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-type-4.0.0" - sources."phin-2.9.3" - sources."picomatch-2.3.1" - sources."pixelmatch-4.0.2" - sources."playwright-1.36.2" - sources."playwright-core-1.36.2" - (sources."plist-3.1.0" // { - dependencies = [ - sources."xmlbuilder-15.1.1" - ]; - }) - sources."pngjs-3.4.0" - sources."process-0.11.10" - sources."proto-list-1.2.4" - sources."pump-3.0.0" - sources."pupa-3.1.0" - sources."query-string-7.1.3" - sources."queue-microtask-1.2.3" - sources."quick-lru-4.0.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - }) - sources."redent-3.0.0" - sources."regenerator-runtime-0.13.11" - sources."registry-auth-token-5.0.2" - sources."registry-url-6.0.1" - sources."render-gif-2.0.4" - sources."resolve-1.22.4" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - (sources."restore-cursor-2.0.0" // { - dependencies = [ - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - ]; - }) - sources."reusify-1.0.4" - sources."rfdc-1.3.0" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-6.6.7" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."semver-5.7.2" - (sources."semver-diff-4.0.0" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - sources."slash-3.0.0" - (sources."slice-ansi-5.0.0" // { - dependencies = [ - sources."ansi-styles-6.2.1" - sources."is-fullwidth-code-point-4.0.0" - ]; - }) - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - sources."split-on-first-1.1.0" - sources."strict-uri-encode-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.1" - ]; - }) - sources."strip-eof-1.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-indent-3.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."temp-dir-2.0.0" - (sources."tempy-1.0.1" // { - dependencies = [ - sources."type-fest-0.16.0" - ]; - }) - (sources."term-img-5.0.0" // { - dependencies = [ - sources."ansi-escapes-4.3.2" - sources."type-fest-0.21.3" - ]; - }) - (sources."terminal-image-1.2.1" // { - dependencies = [ - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."cli-cursor-3.1.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."log-update-4.0.0" - sources."restore-cursor-3.1.0" - sources."slice-ansi-4.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."type-fest-0.21.3" - sources."wrap-ansi-6.2.0" - ]; - }) - sources."through-2.3.8" - sources."timm-1.7.1" - sources."tinycolor2-1.6.0" - sources."tmp-0.0.33" - sources."to-regex-range-5.0.1" - sources."trim-newlines-3.0.1" - sources."tslib-1.14.1" - sources."type-fest-1.4.0" - sources."typedarray-to-buffer-3.1.5" - sources."unique-string-2.0.0" - sources."universalify-2.0.0" - (sources."update-notifier-6.0.2" // { - dependencies = [ - sources."chalk-5.3.0" - sources."semver-7.5.4" - ]; - }) - sources."utif-2.0.1" - sources."validate-npm-package-license-3.0.4" - sources."which-2.0.2" - (sources."widest-line-4.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - (sources."wrap-ansi-8.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."xdg-basedir-5.1.0" - sources."xhr-2.6.0" - sources."xml-parse-from-string-1.0.1" - sources."xml2js-0.4.23" - sources."xmlbuilder-11.0.1" - sources."xtend-4.0.2" - sources."yallist-4.0.0" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Beautiful images of your code — from right inside your terminal."; - homepage = "https://github.com/mixn/carbon-now-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; @@ -94633,736 +93349,6 @@ in bypassCache = true; reconstructLock = true; }; - cordova = nodeEnv.buildNodePackage { - name = "cordova"; - packageName = "cordova"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-12.0.0.tgz"; - sha512 = "D0gGDsaXlmafWxVZExJo6jO8AEVLYBe12Qghjx4zz8XfNhSUe3cInm4TyDZoxB2hFom73eLxIbomYOb0J6tutw=="; - }; - dependencies = [ - sources."@isaacs/cliui-8.0.2" - sources."@isaacs/string-locale-compare-1.1.0" - sources."@netflix/nerror-1.1.3" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-6.3.0" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-9.0.3" - ]; - }) - sources."@npmcli/fs-3.1.0" - (sources."@npmcli/git-4.1.0" // { - dependencies = [ - sources."lru-cache-7.18.3" - sources."which-3.0.1" - ]; - }) - sources."@npmcli/installed-package-contents-2.0.2" - (sources."@npmcli/map-workspaces-3.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.3" - sources."minimatch-9.0.3" - ]; - }) - sources."@npmcli/metavuln-calculator-5.0.1" - sources."@npmcli/name-from-folder-2.0.0" - sources."@npmcli/node-gyp-3.0.0" - (sources."@npmcli/package-json-4.0.1" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.3" - sources."minimatch-9.0.3" - ]; - }) - (sources."@npmcli/promise-spawn-6.0.2" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - sources."@npmcli/query-3.0.0" - (sources."@npmcli/run-script-6.0.2" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - sources."@sigstore/bundle-1.0.0" - sources."@sigstore/protobuf-specs-0.2.0" - sources."@sigstore/tuf-1.0.3" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - (sources."@tufjs/models-1.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-9.0.3" - ]; - }) - sources."@xmldom/xmldom-0.8.10" - sources."abbrev-1.1.1" - sources."abort-controller-3.0.0" - sources."accepts-1.3.8" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" - sources."aggregate-error-3.1.0" - sources."ajv-8.12.0" - sources."ajv-formats-2.1.1" - sources."ansi-0.3.1" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" - sources."array-find-index-1.0.2" - sources."array-flatten-1.1.1" - sources."array-union-2.1.0" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-2.6.4" - sources."asynckit-0.4.0" - sources."atomically-1.7.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.51" - (sources."bin-links-4.0.2" // { - dependencies = [ - sources."signal-exit-4.1.0" - sources."write-file-atomic-5.0.1" - ]; - }) - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."bytes-3.1.2" - sources."debug-2.6.9" - sources."iconv-lite-0.4.24" - sources."ms-2.0.0" - ]; - }) - sources."bplist-parser-0.3.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."buffer-6.0.3" - sources."builtins-5.0.1" - sources."bytes-3.0.0" - (sources."cacache-17.1.3" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."fs-minipass-3.0.2" - sources."glob-10.3.3" - sources."lru-cache-7.18.3" - sources."minimatch-9.0.3" - sources."minipass-5.0.0" - ]; - }) - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - sources."caseless-0.12.0" - (sources."chalk-3.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) - sources."chardet-0.7.0" - sources."chownr-2.0.0" - sources."clean-stack-2.2.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - sources."cmd-shim-6.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."common-ancestor-path-1.0.1" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.1.2" - ]; - }) - sources."concat-map-0.0.1" - (sources."conf-10.2.0" // { - dependencies = [ - sources."dot-prop-6.0.1" - ]; - }) - sources."configstore-5.0.1" - sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - sources."cordova-app-hello-world-6.0.0" - sources."cordova-common-5.0.0" - sources."cordova-create-5.0.0" - (sources."cordova-fetch-4.0.0" // { - dependencies = [ - sources."pify-5.0.0" - sources."which-3.0.1" - ]; - }) - (sources."cordova-lib-12.0.1" // { - dependencies = [ - sources."pify-5.0.0" - sources."signal-exit-4.1.0" - sources."write-file-atomic-5.0.1" - ]; - }) - sources."cordova-serve-4.0.1" - sources."core-util-is-1.0.2" - sources."cross-spawn-7.0.3" - sources."crypto-random-string-2.0.0" - sources."cssesc-3.0.0" - sources."currently-unhandled-0.4.1" - sources."dashdash-1.14.1" - (sources."debounce-fn-4.0.0" // { - dependencies = [ - sources."mimic-fn-3.1.0" - ]; - }) - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."dedent-0.7.0" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."dep-graph-1.1.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."detect-indent-6.1.0" - sources."detect-newline-3.1.0" - sources."dir-glob-3.0.1" - sources."dot-prop-5.3.0" - sources."eastasianwidth-0.2.0" - sources."ecc-jsbn-0.1.2" - sources."editor-1.0.0" - sources."ee-first-1.1.1" - sources."elementtree-0.1.7" - sources."emoji-regex-9.2.2" - sources."encodeurl-1.0.2" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."endent-2.1.0" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."etag-1.8.1" - sources."event-target-shim-5.0.1" - sources."events-3.3.0" - sources."execa-5.1.1" - sources."exponential-backoff-3.1.1" - (sources."express-4.18.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."extend-3.0.2" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - sources."tmp-0.0.33" - ]; - }) - sources."extsprintf-1.4.1" - sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" - sources."fast-json-parse-1.0.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.15.0" - sources."figures-2.0.0" - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."find-up-3.0.0" - (sources."foreground-child-3.1.1" // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - }) - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-extra-11.1.1" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - (sources."gauge-4.0.4" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."get-intrinsic-1.2.1" - sources."get-stream-6.0.1" - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - (sources."har-validator-5.1.5" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - ]; - }) - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-unicode-2.0.1" - (sources."hosted-git-info-6.1.1" // { - dependencies = [ - sources."lru-cache-7.18.3" - ]; - }) - sources."http-cache-semantics-4.1.1" - sources."http-errors-2.0.0" - sources."http-proxy-agent-5.0.0" - sources."http-signature-1.2.0" - sources."https-proxy-agent-5.0.1" - sources."human-signals-2.1.0" - sources."humanize-ms-1.2.1" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - (sources."ignore-walk-6.0.3" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-9.0.3" - ]; - }) - sources."import-fresh-3.3.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."init-package-json-5.0.0" - (sources."inquirer-6.5.2" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."mute-stream-0.0.7" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.1" - ]; - }) - sources."supports-color-5.5.0" - ]; - }) - (sources."insight-0.11.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - ]; - }) - sources."ip-2.0.0" - sources."ipaddr.js-1.9.1" - sources."is-core-module-2.13.0" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-lambda-1.0.1" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-stream-2.0.1" - sources."is-typedarray-1.0.0" - sources."is-wsl-2.2.0" - sources."isexe-2.0.0" - sources."isobject-4.0.0" - sources."isstream-0.1.2" - sources."jackspeak-2.2.3" - sources."jsbn-0.1.1" - sources."json-parse-even-better-errors-3.0.0" - sources."json-schema-0.4.0" - sources."json-schema-traverse-1.0.0" - sources."json-schema-typed-7.0.3" - sources."json-stringify-nice-1.1.4" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-6.1.0" - sources."jsonparse-1.3.1" - (sources."jsprim-1.4.2" // { - dependencies = [ - sources."extsprintf-1.3.0" - ]; - }) - sources."just-diff-6.0.2" - sources."just-diff-apply-5.5.0" - sources."locate-path-3.0.0" - sources."lodash-4.17.21" - sources."lodash.assign-4.2.0" - sources."lodash.debounce-4.0.8" - sources."lodash.isdate-4.0.1" - sources."lodash.isobject-3.0.2" - sources."lodash.zip-4.2.0" - sources."loud-rejection-2.2.0" - sources."lru-cache-10.0.0" - sources."macos-release-2.5.1" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."make-fetch-happen-11.1.1" // { - dependencies = [ - sources."lru-cache-7.18.3" - sources."minipass-5.0.0" - ]; - }) - sources."md5-file-5.0.0" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."methods-1.1.2" - sources."micromatch-4.0.5" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."minipass-7.0.2" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.3" // { - dependencies = [ - sources."minipass-5.0.0" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.3" - sources."mute-stream-1.0.0" - sources."negotiator-0.6.3" - (sources."node-gyp-9.4.0" // { - dependencies = [ - sources."nopt-6.0.0" - sources."npmlog-6.0.2" - ]; - }) - (sources."nopt-7.2.0" // { - dependencies = [ - sources."abbrev-2.0.0" - ]; - }) - sources."normalize-package-data-5.0.0" - sources."npm-bundled-3.0.0" - sources."npm-install-checks-6.1.1" - sources."npm-normalize-package-bin-3.0.1" - sources."npm-package-arg-10.1.0" - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.2" - (sources."npm-registry-fetch-14.0.5" // { - dependencies = [ - sources."minipass-5.0.0" - ]; - }) - sources."npm-run-path-4.0.1" - (sources."npmlog-7.0.1" // { - dependencies = [ - sources."are-we-there-yet-4.0.1" - sources."emoji-regex-8.0.0" - sources."gauge-5.0.1" - sources."readable-stream-4.4.2" - sources."signal-exit-4.1.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."oauth-sign-0.9.0" - sources."object-inspect-1.12.3" - sources."objectorarray-1.0.5" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-7.4.2" - sources."os-name-4.0.1" - sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-map-4.0.0" - sources."p-try-2.2.0" - (sources."pacote-15.2.0" // { - dependencies = [ - sources."fs-minipass-3.0.2" - sources."minipass-5.0.0" - ]; - }) - sources."parent-module-1.0.1" - sources."parse-conflict-json-3.0.1" - sources."parseurl-1.3.3" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-scurry-1.10.1" - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" - sources."performance-now-2.1.0" - sources."picomatch-2.3.1" - sources."pify-4.0.1" - sources."pkg-up-3.1.0" - sources."plist-3.1.0" - sources."postcss-selector-parser-6.0.13" - sources."proc-log-3.0.0" - sources."process-0.11.10" - sources."promise-all-reject-late-1.0.1" - sources."promise-call-limit-1.0.2" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."promzard-1.0.0" - sources."proxy-addr-2.0.7" - sources."psl-1.9.0" - sources."pump-3.0.0" - sources."punycode-2.3.0" - sources."q-1.5.1" - sources."qs-6.11.0" - sources."querystringify-2.2.0" - sources."queue-microtask-1.2.3" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."bytes-3.1.2" - sources."iconv-lite-0.4.24" - ]; - }) - sources."read-2.1.0" - sources."read-chunk-3.2.0" - sources."read-cmd-shim-4.0.0" - (sources."read-package-json-6.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.3" - sources."minimatch-9.0.3" - ]; - }) - sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.2" - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.3" - sources."tough-cookie-2.5.0" - sources."uuid-3.4.0" - ]; - }) - sources."require-from-string-2.0.2" - sources."requires-port-1.0.0" - sources."resolve-1.22.4" - sources."resolve-from-4.0.0" - (sources."restore-cursor-2.0.0" // { - dependencies = [ - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - ]; - }) - sources."retry-0.12.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.1.4" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - ]; - }) - sources."serve-static-1.15.0" - sources."set-blocking-2.0.0" - sources."setprototypeof-1.2.0" - 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."sigstore-1.8.0" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - sources."sshpk-1.17.0" - (sources."ssri-10.0.4" // { - dependencies = [ - sources."minipass-5.0.0" - ]; - }) - sources."statuses-2.0.1" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - sources."string_decoder-1.3.0" - sources."stringify-package-1.0.1" - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - sources."strip-bom-4.0.0" - sources."strip-final-newline-2.0.0" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.18.15" - (sources."tar-6.1.15" // { - dependencies = [ - sources."minipass-5.0.0" - ]; - }) - sources."through-2.3.8" - sources."tmp-0.2.1" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - (sources."tough-cookie-4.1.3" // { - dependencies = [ - sources."universalify-0.2.0" - ]; - }) - sources."treeverse-3.0.0" - sources."tslib-1.14.1" - sources."tuf-js-1.1.7" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-is-1.6.18" - sources."typedarray-to-buffer-3.1.5" - sources."underscore-1.2.1" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."unique-string-2.0.0" - sources."universalify-2.0.0" - sources."unpipe-1.0.0" - sources."uri-js-4.4.1" - sources."url-parse-1.5.10" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."valid-identifier-0.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-5.0.0" - sources."vary-1.1.2" - sources."verror-1.10.0" - sources."walk-up-path-3.0.1" - sources."which-2.0.2" - (sources."wide-align-1.1.5" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."windows-release-4.0.0" // { - dependencies = [ - sources."execa-4.1.0" - sources."get-stream-5.2.0" - sources."human-signals-1.1.1" - ]; - }) - sources."with-open-file-0.1.7" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."xdg-basedir-4.0.0" - sources."xmlbuilder-15.1.1" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Cordova command line interface tool"; - homepage = "https://github.com/apache/cordova-cli#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; @@ -101247,873 +99233,6 @@ in bypassCache = true; reconstructLock = true; }; - firebase-tools = nodeEnv.buildNodePackage { - name = "firebase-tools"; - packageName = "firebase-tools"; - version = "12.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-12.4.7.tgz"; - sha512 = "L5nULzh0PElm2OK5lXsj7zkIwBBB4KsGOg0CvCnjdvJ1ROMN2IqffJ0KR/8paXuGWf5SA0VJj2QjG37jFxrAjg=="; - }; - dependencies = [ - (sources."@apidevtools/json-schema-ref-parser-9.1.2" // { - dependencies = [ - sources."js-yaml-4.1.0" - ]; - }) - sources."@babel/parser-7.22.10" - sources."@colors/colors-1.5.0" - sources."@dabh/diagnostics-2.0.3" - sources."@google-cloud/paginator-4.0.1" - sources."@google-cloud/precise-date-3.0.1" - sources."@google-cloud/projectify-3.0.0" - sources."@google-cloud/promisify-2.0.4" - (sources."@google-cloud/pubsub-3.7.3" // { - dependencies = [ - sources."google-auth-library-8.9.0" - ]; - }) - sources."@grpc/grpc-js-1.8.21" - sources."@grpc/proto-loader-0.7.8" - (sources."@isaacs/cliui-8.0.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."wrap-ansi-8.1.0" - ]; - }) - sources."@jsdevtools/ono-7.1.3" - sources."@jsdoc/salty-0.2.5" - sources."@npmcli/fs-3.1.0" - sources."@opentelemetry/api-1.4.1" - sources."@opentelemetry/semantic-conventions-1.3.1" - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@protobufjs/aspromise-1.1.2" - sources."@protobufjs/base64-1.1.2" - sources."@protobufjs/codegen-2.0.4" - sources."@protobufjs/eventemitter-1.1.0" - sources."@protobufjs/fetch-1.1.0" - sources."@protobufjs/float-1.0.2" - sources."@protobufjs/inquire-1.1.0" - sources."@protobufjs/path-1.1.2" - sources."@protobufjs/pool-1.1.0" - sources."@protobufjs/utf8-1.1.0" - sources."@tootallnate/once-2.0.0" - sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."@types/duplexify-3.6.1" - sources."@types/glob-8.1.0" - sources."@types/json-schema-7.0.12" - sources."@types/linkify-it-3.0.2" - sources."@types/long-4.0.2" - sources."@types/markdown-it-12.2.3" - sources."@types/mdurl-1.0.2" - sources."@types/minimatch-5.1.2" - sources."@types/node-20.4.9" - sources."@types/rimraf-3.0.2" - sources."@types/triple-beam-1.3.2" - sources."abbrev-1.1.1" - sources."abort-controller-3.0.0" - sources."accepts-1.3.8" - sources."acorn-8.10.0" - sources."acorn-jsx-5.3.2" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" - sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" - (sources."ajv-formats-2.1.1" // { - dependencies = [ - sources."ajv-8.12.0" - sources."json-schema-traverse-1.0.0" - ]; - }) - sources."ansi-align-3.0.1" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."ansicolors-0.3.2" - sources."anymatch-3.1.3" - sources."aproba-2.0.0" - sources."archiver-5.3.1" - (sources."archiver-utils-2.1.0" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."are-we-there-yet-3.0.1" - sources."argparse-2.0.1" - sources."array-flatten-1.1.1" - sources."arrify-2.0.1" - sources."as-array-2.0.0" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."ast-types-0.13.4" - sources."async-3.2.4" - sources."async-lock-1.3.2" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - (sources."basic-auth-2.0.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."basic-auth-connect-1.0.0" - sources."basic-ftp-5.0.3" - sources."bcrypt-pbkdf-1.0.2" - sources."bignumber.js-9.1.1" - sources."binary-extensions-2.2.0" - sources."bl-4.1.0" - sources."bluebird-3.7.2" - (sources."body-parser-1.20.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - (sources."boxen-5.1.2" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."buffer-crc32-0.2.13" - sources."buffer-equal-constant-time-1.0.1" - sources."bufferutil-4.0.7" - sources."bytes-3.1.2" - (sources."cacache-17.1.3" // { - dependencies = [ - sources."glob-10.3.3" - sources."lru-cache-7.18.3" - sources."minimatch-9.0.3" - ]; - }) - sources."call-bind-1.0.2" - sources."call-me-maybe-1.0.2" - sources."camelcase-6.3.0" - sources."cardinal-2.1.1" - sources."caseless-0.12.0" - sources."catharsis-0.9.0" - sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."chokidar-3.5.3" - sources."chownr-2.0.0" - sources."ci-info-2.0.0" - sources."cjson-0.3.3" - sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.1" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.0" - sources."cli-table-0.3.11" - sources."cli-table3-0.6.3" - sources."cli-width-3.0.0" - sources."cliui-8.0.1" - sources."clone-1.0.4" - (sources."color-3.2.1" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-string-1.9.1" - sources."color-support-1.1.3" - sources."colorette-2.0.20" - sources."colors-1.0.3" - sources."colorspace-1.1.4" - sources."combined-stream-1.0.8" - sources."commander-4.1.1" - sources."compress-commons-4.1.1" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."bytes-3.0.0" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.1.2" - ]; - }) - sources."concat-map-0.0.1" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."configstore-5.0.1" - (sources."connect-3.7.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."finalhandler-1.1.2" - sources."ms-2.0.0" - sources."on-finished-2.3.0" - sources."statuses-1.5.0" - ]; - }) - sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."cors-2.8.5" - sources."crc-32-1.2.2" - sources."crc32-stream-4.0.2" - (sources."cross-env-5.2.1" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."semver-5.7.2" - ]; - }) - (sources."cross-spawn-7.0.3" // { - dependencies = [ - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."crypto-random-string-2.0.0" - sources."csv-parse-5.4.0" - sources."dashdash-1.14.1" - sources."data-uri-to-buffer-5.0.1" - sources."debug-4.3.4" - sources."deep-extend-0.6.0" - sources."deep-freeze-0.0.1" - sources."deep-is-0.1.4" - sources."defaults-1.0.4" - (sources."degenerator-5.0.1" // { - dependencies = [ - sources."escodegen-2.1.0" - ]; - }) - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."dot-prop-5.3.0" - sources."duplexify-4.1.2" - sources."eastasianwidth-0.2.0" - sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.11" - sources."ee-first-1.1.1" - sources."emoji-regex-8.0.0" - sources."enabled-2.0.0" - sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."end-of-stream-1.4.4" - sources."entities-2.1.0" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."escalade-3.1.1" - sources."escape-goat-2.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-2.0.0" - (sources."escodegen-1.14.3" // { - dependencies = [ - sources."estraverse-4.3.0" - ]; - }) - sources."eslint-visitor-keys-3.4.2" - sources."espree-9.6.1" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."etag-1.8.1" - sources."event-target-shim-5.0.1" - sources."events-listener-1.1.0" - (sources."exegesis-4.1.1" // { - dependencies = [ - sources."ajv-8.12.0" - sources."json-schema-traverse-1.0.0" - ]; - }) - sources."exegesis-express-4.0.0" - sources."exponential-backoff-3.1.1" - (sources."express-4.18.2" // { - dependencies = [ - sources."body-parser-1.20.1" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."raw-body-2.5.1" - ]; - }) - sources."extend-3.0.2" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."tmp-0.0.33" - ]; - }) - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fast-text-encoding-1.0.6" - (sources."fast-url-parser-1.1.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."fecha-4.2.3" - (sources."figures-3.2.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."filesize-6.4.0" - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."fn.name-1.1.0" - (sources."foreground-child-3.1.1" // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - }) - sources."forever-agent-0.6.1" - sources."form-data-4.0.0" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-constants-1.0.0" - sources."fs-extra-10.1.0" - sources."fs-minipass-3.0.2" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."gauge-4.0.4" - sources."gaxios-5.1.3" - sources."gcp-metadata-5.3.0" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" - (sources."get-uri-6.0.1" // { - dependencies = [ - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - }) - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."glob-slash-1.0.0" - sources."glob-slasher-1.0.1" - sources."global-dirs-3.0.1" - (sources."google-auth-library-7.14.1" // { - dependencies = [ - sources."gaxios-4.3.3" - sources."gcp-metadata-4.3.1" - sources."google-p12-pem-3.1.4" - sources."gtoken-5.3.2" - ]; - }) - (sources."google-gax-3.6.1" // { - dependencies = [ - sources."google-auth-library-8.9.0" - ]; - }) - sources."google-p12-pem-4.0.1" - sources."graceful-fs-4.2.11" - sources."gtoken-6.1.2" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-unicode-2.0.1" - sources."has-yarn-2.1.0" - sources."heap-js-2.3.0" - sources."http-cache-semantics-4.1.1" - sources."http-errors-2.0.0" - (sources."http-proxy-agent-7.0.0" // { - dependencies = [ - sources."agent-base-7.1.0" - ]; - }) - sources."http-signature-1.2.0" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-2.0.0" - (sources."inquirer-8.2.6" // { - dependencies = [ - sources."wrap-ansi-6.2.0" - ]; - }) - sources."install-artifact-from-github-1.3.3" - sources."ip-1.1.8" - sources."ip-regex-4.3.0" - sources."ipaddr.js-1.9.1" - sources."is-arrayish-0.3.2" - sources."is-binary-path-2.1.0" - sources."is-ci-2.0.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-interactive-1.0.0" - sources."is-lambda-1.0.1" - sources."is-npm-5.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-stream-2.0.1" - sources."is-stream-ended-0.1.4" - sources."is-typedarray-1.0.0" - sources."is-unicode-supported-0.1.0" - sources."is-url-1.2.4" - sources."is-wsl-1.1.0" - sources."is-yarn-global-0.3.0" - sources."is2-2.0.9" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isomorphic-fetch-3.0.0" - sources."isstream-0.1.2" - sources."jackspeak-2.2.3" - sources."jju-1.4.0" - sources."join-path-1.1.1" - (sources."js-yaml-3.14.1" // { - dependencies = [ - sources."argparse-1.0.10" - ]; - }) - sources."js2xmlparser-4.0.2" - sources."jsbn-0.1.1" - sources."jsdoc-4.0.2" - sources."json-bigint-1.0.0" - sources."json-parse-helpfulerror-1.0.3" - sources."json-ptr-3.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-6.1.0" - (sources."jsonwebtoken-9.0.1" // { - dependencies = [ - sources."jwa-1.4.1" - sources."jws-3.2.2" - ]; - }) - sources."jsprim-1.4.2" - sources."jwa-2.0.0" - sources."jws-4.0.0" - sources."klaw-3.0.0" - sources."kuler-2.0.0" - (sources."lazystream-1.0.1" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."leven-3.1.0" - sources."levn-0.3.0" - sources."libsodium-0.7.11" - sources."libsodium-wrappers-0.7.11" - sources."linkify-it-3.0.3" - sources."lodash-4.17.21" - sources."lodash._objecttypes-2.4.1" - sources."lodash.camelcase-4.3.0" - sources."lodash.defaults-4.2.0" - sources."lodash.difference-4.5.0" - sources."lodash.flatten-4.4.0" - sources."lodash.isobject-2.4.1" - sources."lodash.isplainobject-4.0.6" - sources."lodash.snakecase-4.1.1" - sources."lodash.union-4.6.0" - sources."log-symbols-4.1.0" - sources."logform-2.5.1" - sources."long-4.0.0" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."make-fetch-happen-11.1.1" // { - dependencies = [ - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - sources."socks-proxy-agent-7.0.0" - ]; - }) - sources."markdown-it-12.3.2" - sources."markdown-it-anchor-8.6.7" - sources."marked-4.3.0" - (sources."marked-terminal-5.2.0" // { - dependencies = [ - sources."ansi-escapes-6.2.0" - sources."chalk-5.3.0" - sources."type-fest-3.13.1" - ]; - }) - sources."mdurl-1.0.1" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."mime-2.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - (sources."minimatch-3.1.2" // { - dependencies = [ - sources."brace-expansion-1.1.11" - ]; - }) - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."minipass-fetch-3.0.3" - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - (sources."morgan-1.10.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."on-finished-2.3.0" - ]; - }) - sources."ms-2.1.2" - sources."mute-stream-0.0.8" - sources."nan-2.17.0" - sources."negotiator-0.6.3" - sources."netmask-2.0.2" - sources."nice-try-1.0.5" - sources."node-emoji-1.11.0" - sources."node-fetch-2.6.12" - sources."node-forge-1.3.1" - (sources."node-gyp-9.4.0" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."node-gyp-build-4.6.0" - sources."nopt-6.0.0" - sources."normalize-path-3.0.0" - sources."npmlog-6.0.2" - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."object-hash-3.0.0" - sources."object-inspect-1.12.3" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."one-time-1.0.0" - sources."onetime-5.1.2" - sources."open-6.4.0" - sources."openapi3-ts-3.2.0" - sources."optionator-0.8.3" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-defer-3.0.0" - sources."p-limit-3.1.0" - sources."p-map-4.0.0" - (sources."pac-proxy-agent-7.0.0" // { - dependencies = [ - sources."agent-base-7.1.0" - sources."https-proxy-agent-7.0.1" - ]; - }) - sources."pac-resolver-7.0.0" - sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.0" - ]; - }) - sources."path-to-regexp-0.1.7" - sources."performance-now-2.1.0" - sources."picomatch-2.3.1" - (sources."portfinder-1.0.32" // { - dependencies = [ - sources."async-2.6.4" - sources."debug-3.2.7" - sources."mkdirp-0.5.6" - ]; - }) - sources."prelude-ls-1.1.2" - sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" - sources."promise-breaker-6.0.0" - (sources."promise-retry-2.0.1" // { - dependencies = [ - sources."retry-0.12.0" - ]; - }) - sources."proto-list-1.2.4" - sources."proto3-json-serializer-1.1.1" - (sources."protobufjs-7.2.4" // { - dependencies = [ - sources."long-5.2.3" - ]; - }) - (sources."protobufjs-cli-1.1.1" // { - dependencies = [ - sources."glob-8.1.0" - sources."minimatch-5.1.6" - ]; - }) - sources."proxy-addr-2.0.7" - (sources."proxy-agent-6.3.0" // { - dependencies = [ - sources."agent-base-7.1.0" - sources."https-proxy-agent-7.0.1" - sources."lru-cache-7.18.3" - ]; - }) - sources."proxy-from-env-1.1.0" - sources."psl-1.9.0" - sources."pump-3.0.0" - sources."punycode-2.3.0" - sources."pupa-2.1.1" - sources."qs-6.11.0" - sources."range-parser-1.2.1" - sources."raw-body-2.5.2" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."re2-1.20.1" - sources."readable-stream-3.6.2" - (sources."readdir-glob-1.1.3" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."readdirp-3.6.0" - sources."redeyed-2.1.1" - sources."registry-auth-token-5.0.2" - sources."registry-url-5.1.0" - (sources."request-2.88.2" // { - dependencies = [ - sources."form-data-2.3.3" - sources."qs-6.5.3" - sources."uuid-3.4.0" - ]; - }) - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."requizzle-0.2.4" - sources."restore-cursor-3.1.0" - sources."retry-0.13.1" - sources."retry-request-5.0.2" - sources."rimraf-3.0.2" - (sources."router-1.3.8" // { - dependencies = [ - sources."array-flatten-3.0.0" - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."run-async-2.4.1" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-2.4.3" - sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - (sources."semver-diff-3.1.1" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."mime-1.6.0" - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.15.0" - sources."set-blocking-2.0.0" - sources."setprototypeof-1.2.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."simple-swizzle-0.2.2" - sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) - (sources."socks-proxy-agent-8.0.1" // { - dependencies = [ - sources."agent-base-7.1.0" - ]; - }) - sources."source-map-0.6.1" - sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" - sources."ssri-10.0.4" - sources."stack-trace-0.0.10" - sources."statuses-2.0.1" - sources."stream-chain-2.2.5" - sources."stream-json-1.8.0" - sources."stream-shift-1.0.1" - sources."string-width-4.2.3" - sources."string-width-cjs-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" - sources."strip-json-comments-3.1.1" - (sources."superstatic-9.0.3" // { - dependencies = [ - sources."commander-10.0.1" - sources."isarray-0.0.1" - sources."minimatch-6.2.0" - sources."path-to-regexp-1.8.0" - ]; - }) - sources."supports-color-7.2.0" - sources."supports-hyperlinks-2.3.0" - (sources."tar-6.1.15" // { - dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - ]; - }) - sources."tar-stream-2.2.0" - (sources."tcp-port-used-1.0.2" // { - dependencies = [ - sources."debug-4.3.1" - ]; - }) - sources."text-hex-1.0.0" - sources."through-2.3.8" - sources."tmp-0.2.1" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."tough-cookie-2.5.0" - sources."toxic-1.0.1" - sources."tr46-0.0.3" - sources."triple-beam-1.4.1" - sources."tslib-2.6.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" - sources."type-fest-0.21.3" - sources."type-is-1.6.18" - sources."typedarray-to-buffer-3.1.5" - sources."uc.micro-1.0.6" - sources."uglify-js-3.17.4" - sources."underscore-1.13.6" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."unique-string-2.0.0" - sources."universal-analytics-0.5.3" - sources."universalify-2.0.0" - sources."unpipe-1.0.0" - sources."update-notifier-cjs-5.1.6" - sources."uri-js-4.4.1" - sources."url-join-0.0.1" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."valid-url-1.0.9" - sources."vary-1.1.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-fetch-3.6.17" - sources."whatwg-url-5.0.0" - sources."which-1.3.1" - sources."wide-align-1.1.5" - sources."widest-line-3.1.0" - sources."winston-3.10.0" - sources."winston-transport-4.5.0" - sources."word-wrap-1.2.5" - sources."wrap-ansi-7.0.0" - sources."wrap-ansi-cjs-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."ws-7.5.9" - sources."xdg-basedir-4.0.0" - sources."xmlcreate-2.0.4" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yaml-2.3.1" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - sources."yocto-queue-0.1.0" - sources."zip-stream-4.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Command-Line Interface for Firebase"; - homepage = "https://github.com/firebase/firebase-tools"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; fixjson = nodeEnv.buildNodePackage { name = "fixjson"; packageName = "fixjson"; @@ -106290,416 +103409,6 @@ in bypassCache = true; reconstructLock = true; }; - graphqurl = nodeEnv.buildNodePackage { - name = "graphqurl"; - packageName = "graphqurl"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graphqurl/-/graphqurl-1.0.1.tgz"; - sha512 = "97Chda90OBIHCpH6iQHNYc9qTTADN0LOFbiMcRws3V5SottC/0yTDIQDgBzncZYVCkttyjAnT6YmVuNId7ymQA=="; - }; - dependencies = [ - sources."@ardatan/sync-fetch-0.0.1" - (sources."@babel/code-frame-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.5" - (sources."@babel/highlight-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@cronvel/get-pixels-3.4.1" - sources."@graphql-tools/batch-execute-8.5.22" - sources."@graphql-tools/delegate-9.0.35" - sources."@graphql-tools/executor-0.0.20" - (sources."@graphql-tools/executor-graphql-ws-0.0.14" // { - dependencies = [ - sources."isomorphic-ws-5.0.0" - sources."ws-8.13.0" - ]; - }) - sources."@graphql-tools/executor-http-0.1.10" - (sources."@graphql-tools/executor-legacy-ws-0.0.11" // { - dependencies = [ - sources."isomorphic-ws-5.0.0" - sources."ws-8.13.0" - ]; - }) - sources."@graphql-tools/graphql-file-loader-7.5.17" - sources."@graphql-tools/import-6.7.18" - sources."@graphql-tools/json-file-loader-7.4.18" - sources."@graphql-tools/load-7.8.14" - sources."@graphql-tools/merge-8.4.2" - sources."@graphql-tools/schema-9.0.19" - (sources."@graphql-tools/url-loader-7.17.18" // { - dependencies = [ - sources."isomorphic-ws-5.0.0" - sources."ws-8.13.0" - ]; - }) - sources."@graphql-tools/utils-9.2.1" - sources."@graphql-tools/wrap-9.4.2" - sources."@graphql-typed-document-node/core-3.2.0" - sources."@iarna/toml-2.2.5" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.0" - sources."@oclif/config-1.17.0" - sources."@oclif/errors-1.3.4" - sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.16" // { - dependencies = [ - sources."@oclif/errors-1.3.6" - ]; - }) - (sources."@oclif/plugin-help-3.2.1" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."supports-color-5.5.0" - (sources."wrap-ansi-4.0.0" // { - dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - ]; - }) - sources."@oclif/screen-1.0.4" - sources."@peculiar/asn1-schema-2.3.6" - sources."@peculiar/json-schema-1.1.12" - sources."@peculiar/webcrypto-1.4.3" - sources."@repeaterjs/repeater-3.0.4" - sources."@types/json-schema-7.0.9" - sources."@types/node-20.4.9" - sources."@types/ws-8.5.5" - sources."@whatwg-node/events-0.0.3" - sources."@whatwg-node/fetch-0.8.8" - sources."@whatwg-node/node-fetch-0.3.6" - sources."accepts-1.3.8" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."ansicolors-0.3.2" - sources."argparse-2.0.1" - sources."array-flatten-1.1.1" - sources."array-union-2.1.0" - sources."asn1js-3.0.5" - sources."async-limiter-1.0.1" - sources."backo2-1.0.2" - sources."balanced-match-1.0.2" - (sources."body-parser-1.18.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."bufferutil-4.0.7" - sources."busboy-1.6.0" - sources."bytes-3.0.0" - sources."callsites-3.1.0" - sources."cardinal-2.1.1" - sources."chalk-4.1.2" - sources."chroma-js-2.4.2" - sources."clean-stack-3.0.1" - (sources."cli-ux-4.9.3" // { - dependencies = [ - sources."ansi-regex-4.1.1" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."clean-stack-2.2.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."fs-extra-7.0.1" - sources."has-flag-3.0.0" - sources."indent-string-3.2.0" - sources."is-wsl-1.1.0" - sources."semver-5.7.2" - sources."strip-ansi-5.2.0" - sources."supports-color-5.5.0" - sources."tslib-1.14.1" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."content-disposition-0.5.2" - sources."content-type-1.0.5" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."cosmiconfig-8.0.0" - sources."cosmiconfig-toml-loader-1.0.0" - sources."cross-spawn-7.0.3" - sources."cwise-compiler-1.1.3" - sources."dataloader-2.2.2" - sources."debug-4.3.4" - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."dir-glob-3.0.1" - sources."dset-3.1.2" - sources."ee-first-1.1.1" - sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."error-ex-1.3.2" - sources."escape-html-1.0.3" - sources."escape-string-regexp-4.0.0" - sources."esprima-4.0.1" - sources."etag-1.8.1" - sources."eventemitter3-3.1.2" - (sources."express-4.16.3" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."extract-files-11.0.0" - sources."extract-stack-1.0.0" - sources."fast-decode-uri-component-1.0.1" - sources."fast-glob-3.3.1" - sources."fast-querystring-1.1.2" - sources."fast-url-parser-1.1.3" - sources."fastq-1.15.0" - sources."fill-range-7.0.1" - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-extra-8.1.0" - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."graceful-fs-4.2.11" - sources."graphql-15.4.0" - sources."graphql-config-4.5.0" - (sources."graphql-language-service-interface-2.10.2" // { - dependencies = [ - sources."graphql-16.7.1" - sources."graphql-language-service-utils-2.7.1" - ]; - }) - (sources."graphql-language-service-parser-1.10.4" // { - dependencies = [ - sources."graphql-16.7.1" - ]; - }) - (sources."graphql-language-service-types-1.8.7" // { - dependencies = [ - sources."graphql-16.7.1" - ]; - }) - sources."graphql-language-service-utils-2.5.1" - sources."graphql-ws-5.12.1" - sources."has-flag-4.0.0" - sources."http-errors-1.6.3" - sources."hyperlinker-1.0.0" - sources."iconv-lite-0.4.19" - sources."ignore-5.2.4" - (sources."import-fresh-3.3.0" // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - }) - sources."indent-string-4.0.0" - sources."inherits-2.0.3" - sources."iota-array-1.0.0" - sources."ipaddr.js-1.9.1" - sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-wsl-2.2.0" - sources."isexe-2.0.0" - sources."isomorphic-fetch-3.0.0" - sources."isomorphic-ws-4.0.1" - sources."iterall-1.3.0" - sources."jiti-1.17.1" - sources."jpeg-js-0.4.4" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."json-parse-even-better-errors-2.3.1" - sources."jsonfile-4.0.0" - sources."lazyness-1.2.0" - sources."lines-and-columns-1.2.4" - sources."lodash-4.17.21" - sources."lodash._reinterpolate-3.0.0" - sources."lodash.template-4.5.0" - sources."lodash.templatesettings-4.2.0" - sources."lru-cache-6.0.0" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."merge2-1.4.1" - sources."meros-1.3.0" - sources."methods-1.1.2" - sources."micromatch-4.0.5" - sources."mime-1.4.1" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimatch-4.2.3" - sources."ms-2.1.2" - sources."ndarray-1.0.19" - sources."ndarray-pack-1.2.1" - sources."negotiator-0.6.3" - sources."nextgen-events-1.5.3" - sources."node-bitmap-0.0.1" - sources."node-fetch-2.6.12" - sources."node-gyp-build-4.6.0" - sources."normalize-path-2.1.1" - sources."nullthrows-1.1.1" - sources."omggif-1.0.10" - sources."on-finished-2.3.0" - sources."open-7.3.1" - sources."p-limit-3.1.0" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."parseurl-1.3.3" - (sources."password-prompt-1.1.3" // { - dependencies = [ - sources."ansi-escapes-4.3.2" - ]; - }) - sources."path-key-3.1.1" - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."pngjs-6.0.0" - sources."proxy-addr-2.0.7" - sources."punycode-1.4.1" - sources."pvtsutils-1.3.3" - sources."pvutils-1.1.3" - sources."qs-6.5.1" - sources."queue-microtask-1.2.3" - sources."range-parser-1.2.1" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" - ]; - }) - sources."redeyed-2.1.1" - sources."remove-trailing-separator-1.1.0" - sources."resolve-from-5.0.0" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.1.1" - sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - (sources."send-0.16.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."serve-static-1.13.2" - sources."setimmediate-1.0.5" - sources."setprototypeof-1.1.0" - sources."seventh-0.7.40" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."slash-3.0.0" - sources."statuses-1.4.0" - sources."streamsearch-1.1.0" - sources."string-env-interpolation-1.0.1" - sources."string-kit-0.11.10" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - (sources."subscriptions-transport-ws-0.9.18" // { - dependencies = [ - sources."ws-5.2.3" - ]; - }) - sources."supports-color-7.2.0" - (sources."supports-hyperlinks-1.0.1" // { - dependencies = [ - sources."has-flag-2.0.0" - (sources."supports-color-5.5.0" // { - dependencies = [ - sources."has-flag-3.0.0" - ]; - }) - ]; - }) - sources."symbol-observable-1.2.0" - sources."terminal-kit-1.49.4" - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."tree-kit-0.7.5" - sources."treeify-1.1.0" - sources."tslib-2.6.1" - sources."type-fest-0.21.3" - sources."type-is-1.6.18" - sources."uniq-1.0.1" - sources."universalify-0.1.2" - sources."unixify-1.0.0" - sources."unpipe-1.0.0" - sources."urlpattern-polyfill-8.0.2" - sources."utf-8-validate-6.0.3" - sources."utils-merge-1.0.1" - sources."value-or-promise-1.0.12" - sources."vary-1.1.2" - sources."vscode-languageserver-types-3.17.3" - sources."web-streams-polyfill-3.2.1" - sources."webcrypto-core-1.7.7" - sources."webidl-conversions-3.0.1" - sources."whatwg-fetch-3.6.17" - sources."whatwg-url-5.0.0" - sources."which-2.0.2" - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" - (sources."ws-7.4.2" // { - dependencies = [ - sources."utf-8-validate-5.0.10" - ]; - }) - sources."yallist-4.0.0" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "cURL for GraphQL - CLI and JS library for making GraphQL queries"; - homepage = "https://github.com/hasura/graphqurl"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; packageName = "grunt-cli"; @@ -107999,238 +104708,6 @@ in bypassCache = true; reconstructLock = true; }; - hyperpotamus = nodeEnv.buildNodePackage { - name = "hyperpotamus"; - packageName = "hyperpotamus"; - version = "0.39.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hyperpotamus/-/hyperpotamus-0.39.0.tgz"; - sha512 = "T3RBIVw6hZACXRtlE3F0scXQa2tU3Ybbg2d0MDBYulv3NunZ5U0LHtBFnslWwFShNlnrXCEo5+f0TXj4YP4y6Q=="; - }; - dependencies = [ - sources."@colors/colors-1.5.0" - sources."@fast-csv/format-4.3.5" - sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.54" - sources."ajv-6.12.6" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-1.0.10" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-2.6.4" - sources."asynckit-0.4.0" - sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1433.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.7.2" - sources."boolbase-1.0.0" - sources."buffer-4.9.2" - sources."calfinated-1.4.1" - sources."call-bind-1.0.2" - sources."caseless-0.12.0" - sources."cheerio-0.22.0" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."colors-1.4.0" - sources."combined-stream-1.0.8" - sources."core-util-is-1.0.2" - sources."css-select-1.2.0" - sources."css-what-2.1.3" - sources."cycle-1.0.3" - sources."dashdash-1.14.1" - sources."debug-4.3.4" - sources."deep-is-0.1.4" - sources."delayed-stream-1.0.0" - sources."dom-serializer-0.1.1" - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.5.1" - sources."ecc-jsbn-0.1.2" - sources."emoji-regex-8.0.0" - sources."entities-1.1.2" - sources."escalade-3.1.1" - sources."escodegen-1.14.3" - sources."esprima-4.0.1" - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."events-1.1.1" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."eyes-0.1.8" - sources."fast-csv-4.3.6" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."for-each-0.3.3" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."function-bind-1.1.1" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" - sources."getpass-0.1.7" - sources."gopd-1.0.1" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-1.0.3" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."htmlparser2-3.10.1" - sources."http-signature-1.2.0" - sources."ieee754-1.1.13" - sources."inherits-2.0.4" - (sources."ip-address-6.1.0" // { - dependencies = [ - sources."jsbn-1.1.0" - sources."sprintf-js-1.1.2" - ]; - }) - sources."is-arguments-1.1.1" - sources."is-callable-1.2.7" - sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" - sources."is-typed-array-1.1.12" - sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" - sources."isstream-0.1.2" - sources."jmespath-0.16.0" - sources."js-yaml-3.14.1" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - (sources."jsonpath-1.1.1" // { - dependencies = [ - sources."esprima-1.2.2" - ]; - }) - (sources."jsprim-1.4.2" // { - dependencies = [ - sources."verror-1.10.0" - ]; - }) - sources."levn-0.3.0" - sources."lodash-4.17.21" - sources."lodash.assignin-4.2.0" - sources."lodash.bind-4.2.1" - sources."lodash.defaults-4.2.0" - sources."lodash.escaperegexp-4.1.2" - sources."lodash.filter-4.6.0" - sources."lodash.flatten-4.4.0" - sources."lodash.foreach-4.5.0" - sources."lodash.groupby-4.6.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isequal-4.5.0" - sources."lodash.isfunction-3.0.9" - sources."lodash.isnil-4.0.0" - sources."lodash.isundefined-3.0.1" - sources."lodash.map-4.6.0" - sources."lodash.merge-4.6.2" - sources."lodash.pick-4.4.0" - sources."lodash.reduce-4.6.0" - sources."lodash.reject-4.6.0" - sources."lodash.some-4.6.0" - sources."lodash.uniq-4.5.0" - sources."marked-4.3.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."moment-2.29.4" - sources."moment-timezone-0.5.43" - sources."ms-2.1.2" - sources."mute-stream-0.0.8" - sources."named-regexp-0.1.1" - sources."nth-check-1.0.2" - sources."oauth-sign-0.9.0" - sources."optionator-0.8.3" - sources."performance-now-2.1.0" - sources."prelude-ls-1.1.2" - (sources."prompt-1.3.0" // { - dependencies = [ - sources."async-3.2.3" - ]; - }) - sources."psl-1.9.0" - sources."punycode-1.3.2" - sources."qs-6.5.3" - sources."querystring-0.2.0" - sources."read-1.0.7" - sources."readable-stream-3.6.2" - sources."recursive-readdir-sync-1.0.6" - (sources."request-2.88.2" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - sources."request-as-curl-0.1.0" - sources."require-directory-2.1.1" - sources."revalidator-0.1.8" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.2.1" - sources."semver-5.7.2" - sources."socks5-client-1.2.8" - sources."socks5-http-client-1.0.4" - sources."source-map-0.6.1" - sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" - sources."stack-trace-0.0.10" - sources."static-eval-2.0.2" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - (sources."tough-cookie-2.5.0" // { - dependencies = [ - sources."punycode-2.3.0" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" - sources."underscore-1.12.1" - (sources."uri-js-4.4.1" // { - dependencies = [ - sources."punycode-2.3.0" - ]; - }) - sources."url-0.10.3" - sources."util-0.12.5" - sources."util-deprecate-1.0.2" - sources."uuid-8.0.0" - sources."verror-1.10.1" - sources."which-typed-array-1.1.11" - (sources."winston-2.4.7" // { - dependencies = [ - sources."colors-1.0.3" - ]; - }) - sources."word-wrap-1.2.5" - sources."wrap-ansi-7.0.0" - sources."xml2js-0.5.0" - sources."xmlbuilder-11.0.1" - sources."xmldom-0.5.0" - sources."xpath-0.0.23" - sources."y18n-5.0.8" - sources."yaml-include-1.2.1" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "YAML based HTTP script processing engine"; - homepage = "https://github.com/pmarkert/hyperpotamus/wiki"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; ijavascript = nodeEnv.buildNodePackage { name = "ijavascript"; packageName = "ijavascript"; @@ -108915,323 +105392,6 @@ in bypassCache = true; reconstructLock = true; }; - ionic = nodeEnv.buildNodePackage { - name = "ionic"; - packageName = "ionic"; - version = "5.4.16"; - src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-5.4.16.tgz"; - sha512 = "MlHmcctGxxUdvjKJGDUQOZEJMMTrZk3ZtC0tkMUy/im53c0giZrKQtkBKXOLK6uYXBnhlOXn0jrs97PnfNadyg=="; - }; - dependencies = [ - sources."@ionic/cli-framework-3.0.6" - sources."@ionic/cli-framework-prompts-1.0.4" - sources."@ionic/discover-2.0.8" - sources."@ionic/utils-array-1.2.2" - sources."@ionic/utils-fs-2.0.9" - sources."@ionic/utils-network-1.0.6" - sources."@ionic/utils-object-1.0.6" - sources."@ionic/utils-process-1.0.9" - sources."@ionic/utils-stream-2.0.5" - sources."@ionic/utils-subprocess-1.0.13" - sources."@ionic/utils-terminal-1.1.2" - sources."@tootallnate/once-1.1.2" - sources."agent-base-6.0.2" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.1" - sources."ansi-styles-3.2.1" - (sources."ast-types-0.13.4" // { - dependencies = [ - sources."tslib-2.6.1" - ]; - }) - sources."astral-regex-2.0.0" - sources."asynckit-0.4.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."bufferutil-4.0.7" - sources."bytes-3.1.2" - sources."call-bind-1.0.2" - (sources."chalk-3.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."chardet-0.7.0" - sources."chownr-1.1.4" - sources."cli-cursor-2.1.0" - sources."cli-width-3.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."combined-stream-1.0.8" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."cookiejar-2.1.4" - sources."core-util-is-1.0.3" - sources."cross-spawn-7.0.3" - sources."data-uri-to-buffer-3.0.1" - sources."debug-4.3.4" - sources."deep-is-0.1.4" - sources."degenerator-2.2.0" - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."diff-4.0.2" - (sources."duplexer2-0.1.4" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."elementtree-0.1.7" - sources."emoji-regex-7.0.3" - sources."end-of-stream-1.4.4" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.3" - sources."esprima-4.0.1" - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - (sources."execa-1.0.0" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - }) - sources."external-editor-3.1.0" - sources."fast-levenshtein-2.0.6" - sources."figures-3.2.0" - sources."file-uri-to-path-2.0.0" - sources."form-data-2.5.1" - sources."formidable-1.2.6" - sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.7" - sources."fs.realpath-1.0.0" - (sources."ftp-0.3.10" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."get-stream-4.1.0" - sources."get-uri-3.0.2" - sources."glob-7.2.3" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."http-errors-2.0.0" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.4.24" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - (sources."inquirer-7.3.3" // { - dependencies = [ - sources."ansi-escapes-4.3.2" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."cli-cursor-3.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."restore-cursor-3.1.0" - ]; - }) - sources."ip-1.1.8" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" - sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."jsonfile-4.0.0" - (sources."leek-0.0.24" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."levn-0.3.0" - sources."lodash-4.17.21" - sources."lodash._baseassign-3.2.0" - sources."lodash._basecopy-3.0.1" - sources."lodash._bindcallback-3.0.1" - sources."lodash._createassigner-3.1.1" - sources."lodash._getnative-3.9.1" - sources."lodash._isiterateecall-3.0.9" - sources."lodash.assign-3.2.0" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - sources."lodash.keys-3.1.2" - sources."lodash.restparam-3.6.1" - (sources."log-update-3.4.0" // { - dependencies = [ - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."wrap-ansi-5.1.0" - ]; - }) - sources."lru-cache-5.1.1" - sources."macos-release-2.5.1" - sources."methods-1.1.2" - sources."mime-2.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-1.2.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.6" - sources."ms-2.1.2" - sources."mute-stream-0.0.8" - sources."netmask-1.0.6" - sources."nice-try-1.0.5" - sources."node-gyp-build-4.6.0" - (sources."npm-run-path-2.0.2" // { - dependencies = [ - sources."path-key-2.0.1" - ]; - }) - sources."object-inspect-1.12.3" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."open-7.4.2" - sources."optionator-0.8.3" - sources."os-name-3.1.0" - sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."pac-proxy-agent-4.1.0" - (sources."pac-resolver-4.2.0" // { - dependencies = [ - sources."netmask-2.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."prelude-ls-1.1.2" - sources."process-nextick-args-2.0.1" - sources."proxy-agent-4.0.1" - sources."proxy-from-env-1.1.0" - sources."pump-3.0.0" - sources."qs-6.11.2" - sources."raw-body-2.5.2" - sources."readable-stream-3.6.2" - sources."restore-cursor-2.0.0" - sources."rimraf-3.0.2" - sources."rsvp-3.6.2" - sources."run-async-2.4.1" - sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.1.4" - sources."semver-6.3.1" - sources."setprototypeof-1.2.0" - 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."slice-ansi-3.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."is-fullwidth-code-point-3.0.0" - ]; - }) - sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) - sources."socks-proxy-agent-5.0.1" - sources."source-map-0.6.1" - sources."split2-3.2.2" - sources."ssh-config-1.1.6" - sources."statuses-2.0.1" - (sources."stream-combiner2-1.1.1" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - (sources."string-width-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - ]; - }) - sources."string_decoder-1.3.0" - (sources."strip-ansi-6.0.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - ]; - }) - sources."strip-eof-1.0.0" - sources."superagent-4.1.0" - (sources."superagent-proxy-2.1.0" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."supports-color-7.2.0" - sources."tar-4.4.19" - sources."through-2.3.8" - sources."through2-3.0.2" - sources."tmp-0.0.33" - sources."toidentifier-1.0.1" - sources."tree-kill-1.2.2" - sources."tslib-1.14.1" - sources."type-check-0.3.2" - sources."type-fest-0.21.3" - sources."typedarray-to-buffer-3.1.5" - sources."universalify-0.1.2" - sources."unpipe-1.0.0" - sources."untildify-4.0.0" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."which-2.0.2" - sources."windows-release-3.3.3" - sources."word-wrap-1.2.5" - (sources."wrap-ansi-6.2.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."ws-7.5.9" - sources."xregexp-2.0.0" - sources."yallist-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A tool for creating and developing Ionic Framework mobile apps."; - homepage = "https://ionicframework.com"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; @@ -114963,61 +111123,6 @@ in bypassCache = true; reconstructLock = true; }; - markdownlint-cli2 = nodeEnv.buildNodePackage { - name = "markdownlint-cli2"; - packageName = "markdownlint-cli2"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.8.1.tgz"; - sha512 = "y0Siwt+RApKxSSb0CT9p7z1DcAO+ncjrB9IpC/jflJRIet4namCFmxLTbfBBQdPF6EntPk5yyXKe7vcoPGlnXw=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."argparse-2.0.1" - sources."braces-3.0.2" - sources."dir-glob-3.0.1" - sources."entities-3.0.1" - sources."fast-glob-3.3.1" - sources."fastq-1.15.0" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" - sources."globby-13.1.4" - sources."ignore-5.2.4" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."linkify-it-4.0.1" - sources."markdown-it-13.0.1" - sources."markdownlint-0.29.0" - sources."markdownlint-cli2-0.8.1" - sources."markdownlint-cli2-formatter-default-0.0.4" - sources."markdownlint-micromark-0.1.5" - sources."mdurl-1.0.1" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."slash-4.0.0" - sources."strip-json-comments-5.0.0" - sources."to-regex-range-5.0.1" - sources."uc.micro-1.0.6" - sources."yaml-2.3.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A fast, flexible, configuration-based command-line interface for linting Markdown/CommonMark files with the `markdownlint` library"; - homepage = "https://github.com/DavidAnson/markdownlint-cli2"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index c4ddc2a40a591..89f2bcf158e2a 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -92,17 +92,6 @@ final: prev: { ''; }; - carbon-now-cli = prev.carbon-now-cli.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - prePatch = '' - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 - ''; - postInstall = '' - wrapProgram $out/bin/carbon-now \ - --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium - ''; - }; - coc-imselect = prev.coc-imselect.override (oldAttrs: { meta = oldAttrs.meta // { broken = since "10"; }; }); @@ -136,9 +125,6 @@ final: prev: { ''; }; - firebase-tools = prev.firebase-tools.override { - nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkgs.xcbuild ]; - }; git-ssb = prev.git-ssb.override (oldAttrs: { buildInputs = [ final.node-gyp-build ]; diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index f2b19355b099e..96814ebdc72ab 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,4 +1,5 @@ -{ lib, buildDunePackage, cstruct, sexplib, ppxlib, stdlib-shims +{ lib, buildDunePackage, cstruct, sexplib, ppxlib +, ocaml-migrate-parsetree-2 , ounit, cppo, ppx_sexp_conv, cstruct-unix, cstruct-sexp }: @@ -11,11 +12,10 @@ else inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; + propagatedBuildInputs = [ cstruct ppxlib sexplib ]; doCheck = true; nativeCheckInputs = [ cppo ]; - checkInputs = [ ounit ppx_sexp_conv cstruct-sexp cstruct-unix ]; + checkInputs = [ ounit ppx_sexp_conv cstruct-sexp cstruct-unix ocaml-migrate-parsetree-2 ]; } diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 8ec18c2eab372..f2bad712bce76 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -3,7 +3,7 @@ if lib.versionAtLeast ocaml.version "4.07" then if lib.versionAtLeast ocaml.version "4.08" then if lib.versionAtLeast ocaml.version "4.11" - then "0.28.0" else "0.24.0" else "0.15.0" else "0.13.0" + then "0.30.0" else "0.24.0" else "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio , stdlib-shims, ocaml-migrate-parsetree-2 }: @@ -13,34 +13,37 @@ let param = { sha256 = "sha256-pct57oO7qAMEtlvEfymFOCvviWaLG0b5/7NzTC8vdSE="; max_version = "4.10"; useDune2 = false; - useOMP2 = false; + OMP = [ ocaml-migrate-parsetree ]; }; "0.13.0" = { sha256 = "sha256-geHz0whQDg5/YQjVsN2iuHlkClwh7z3Eqb2QOBzuOdk="; max_version = "4.11"; useDune2 = false; - useOMP2 = false; + OMP = [ ocaml-migrate-parsetree ]; }; "0.15.0" = { sha256 = "sha256-C2MNf410qJmlXMJxiLXOA+c1qT8H6gwt5WUy2P2TszA="; min_version = "4.07"; max_version = "4.12"; - useOMP2 = false; + OMP = [ ocaml-migrate-parsetree ]; }; "0.18.0" = { sha256 = "sha256-nUg8NkZ64GHHDfcWbtFGXq3MNEKu+nYPtcVDm/gEfcM="; min_version = "4.07"; max_version = "4.12"; + OMP = [ ocaml-migrate-parsetree-2 ]; }; "0.22.0" = { sha256 = "sha256-PuuR4DlmZiKEoyIuYS3uf0+it2N8U9lXLSp0E0u5bXo="; min_version = "4.07"; max_version = "4.13"; + OMP = [ ocaml-migrate-parsetree-2 ]; }; "0.22.2" = { sha256 = "sha256-0Oih69xiILFXTXqSbwCEYMURjM73m/mgzgJC80z/Ilo="; min_version = "4.07"; max_version = "4.14"; + OMP = [ ocaml-migrate-parsetree-2 ]; }; "0.23.0" = { sha256 = "sha256-G1g2wYa51aFqz0falPOWj08ItRm3cpzYao/TmXH+EuU="; @@ -50,10 +53,16 @@ let param = { "0.24.0" = { sha256 = "sha256-d2YCfC7ND1s7Rg6SEqcHCcZ0QngRPrkfMXxWxB56kMg="; min_version = "4.07"; + max_version = "5.1"; }; "0.28.0" = { sha256 = "sha256-2Hrl+aCBIGMIypZICbUKZq646D0lSAHouWdUSLYM83c="; min_version = "4.07"; + max_version = "5.1"; + }; + "0.30.0" = { + sha256 = "sha256-3UpjvenSm0mBDgTXZTk3yTLxd6lByg4ZgratU6xEIRA="; + min_version = "4.07"; }; }."${version}"; in @@ -75,9 +84,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocaml-compiler-libs - (if param.useOMP2 or true - then ocaml-migrate-parsetree-2 - else ocaml-migrate-parsetree) + ] ++ (param.OMP or []) ++ [ ppx_derivers stdio stdlib-shims diff --git a/pkgs/development/python-modules/aioquic-mitmproxy/default.nix b/pkgs/development/python-modules/aioquic-mitmproxy/default.nix new file mode 100644 index 0000000000000..7fab497b26033 --- /dev/null +++ b/pkgs/development/python-modules/aioquic-mitmproxy/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, certifi +, cryptography +, fetchFromGitHub +, pylsqpack +, pyopenssl +, pytestCheckHook +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "aioquic-mitmproxy"; + version = "0.9.20.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "meitinger"; + repo = "aioquic_mitmproxy"; + rev = "refs/tags/${version}"; + hash = "sha256-VcIbtrcA0dBEE52ZD90IbXoh6L3wDUbr2kFJikts6+w="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + certifi + cryptography + pylsqpack + pyopenssl + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aioquic" + ]; + + meta = with lib; { + description = "QUIC and HTTP/3 implementation in Python"; + homepage = "https://github.com/meitinger/aioquic_mitmproxy"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/androidtvremote2/default.nix b/pkgs/development/python-modules/androidtvremote2/default.nix index 9640906d169f5..976ba217ce464 100644 --- a/pkgs/development/python-modules/androidtvremote2/default.nix +++ b/pkgs/development/python-modules/androidtvremote2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "androidtvremote2"; - version = "0.0.13"; + version = "0.0.14"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "androidtvremote2"; rev = "refs/tags/v${version}"; - hash = "sha256-+9VVUIvM//Fxv1a/+PAKWSQE8/TgBZzeTisgMqj6KPU="; + hash = "sha256-m53TlNrrCjA4CqvR02Yph7Gr5Dt17VJFBX6MC3arWOI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 0ba50dc3f8630..5643ab8ce545f 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -8,15 +8,14 @@ buildPythonPackage rec { pname = "azure-mgmt-storage"; - version = "21.0.0"; + version = "21.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-brE+7s+JGVsrX0e+Bnnj8niI79e9ITLux+vLznXLE3c="; + hash = "sha256-1tPA6RfJiLye0Eckd9PvP5CIYAnrHZenEZRPg3VjAWI="; }; propagatedBuildInputs = [ @@ -32,7 +31,7 @@ buildPythonPackage rec { "azure.mgmt.storage" ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { diff --git a/pkgs/development/tools/beautysh/default.nix b/pkgs/development/python-modules/beautysh/default.nix index 33b8fe0520d49..c41414075f381 100644 --- a/pkgs/development/tools/beautysh/default.nix +++ b/pkgs/development/python-modules/beautysh/default.nix @@ -1,10 +1,16 @@ { lib +, buildPythonPackage +, colorama , fetchFromGitHub , fetchpatch -, python3 +, poetry-core +, pytestCheckHook +, setuptools +, types-colorama +, types-setuptools }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "beautysh"; version = "6.2.1"; format = "pyproject"; @@ -25,26 +31,26 @@ python3.pkgs.buildPythonApplication rec { }) ]; - nativeBuildInputs = with python3.pkgs; [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'types-setuptools = "^57.4.0"' 'types-setuptools = "*"' + ''; + + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ colorama setuptools types-colorama types-setuptools ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'types-setuptools = "^57.4.0"' 'types-setuptools = "*"' - ''; - pythonImportsCheck = [ "beautysh" ]; diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index df6c9a14dc3e6..3a53322ceb91b 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.66"; + version = "0.2.67"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - hash = "sha256-0mj1+sbNOE7PBFj99qfqgeYipaRxkQTUIPTPpXueczo="; + hash = "sha256-M0LyEKJUcamv0PcflVI97zrXAoe1iV5sJ/oh60bMo6c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 282f0dc091000..bced86608d4dc 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.1.0"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-CcLb+2UOLKwfBw3E51LJUZmLqpBw85nLXl1J/oFfEVs="; + hash = "sha256-fQIvOa9/Bqo4BN6LJz8COHo6n2m4XogVYCMdAUvDZUQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 646fef8f47fa9..6043f1c155652 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -1,5 +1,5 @@ { lib -, fetchPypi +, fetchFromGitHub , rustPlatform , cffi , libiconv @@ -15,17 +15,20 @@ }: buildPythonPackage rec { - pname = "cmsis_pack_manager"; + pname = "cmsis-pack-manager"; version = "0.5.2"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-sVfyz9D7/0anIp0bEPp1EJkERDbNJ3dCcydLbty1KsQ="; + src = fetchFromGitHub { + owner = "pyocd"; + repo = "cmsis-pack-manager"; + rev = "refs/tags/v${version}"; + hash = "sha256-PeyJf3TGUxv8/MKIQUgWrenrK4Hb+4cvtDA2h3r6kGg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "dO4qw5Jx0exwb4RuOhu6qvGxQZ+LayHtXDHZKADLTEI="; + hash = "sha256-dO4qw5Jx0exwb4RuOhu6qvGxQZ+LayHtXDHZKADLTEI="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook ]; @@ -35,10 +38,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ appdirs pyyaml ]; nativeCheckInputs = [ hypothesis jinja2 pytestCheckHook unzip ]; - format = "pyproject"; - + # remove cmsis_pack_manager source directory so that binaries can be imported + # from the installed wheel instead preCheck = '' - unzip $dist/*.whl cmsis_pack_manager/cmsis_pack_manager/native.so + rm -r cmsis_pack_manager ''; disabledTests = [ diff --git a/pkgs/development/python-modules/datasette-publish-fly/default.nix b/pkgs/development/python-modules/datasette-publish-fly/default.nix index 521b408b524c1..a9c04618ee312 100644 --- a/pkgs/development/python-modules/datasette-publish-fly/default.nix +++ b/pkgs/development/python-modules/datasette-publish-fly/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "datasette-publish-fly"; - version = "1.3"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-L94QYcrTWjuoz0aEFTxPi8Xg0xERP1zCs7+vzhoJagc="; + hash = "sha256-diaxr+fNNgkJvLGkLo+lK0ThTsXYDePFsvTetMbDRMk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 181692d4fe22a..b92323e0c15c6 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -3,33 +3,46 @@ , fetchFromGitHub , setuptools , setuptools-scm +, pythonRelaxDepsHook , pyasn1 , pyasn1-modules , cryptography +, tinydb +, joblib +, tinyrecord , pytestCheckHook }: buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.16.2"; + version = "0.17.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-JL9znvXl+RIEzycKhXkggEJ87bQ+UzspBD1YM3AoYlc="; + hash = "sha256-US9m7weW11+VxX6ZsKP5tYKp+bQoiI+TZ3YWE97D/f0="; }; nativeBuildInputs = [ setuptools setuptools-scm + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "tinydb" + "joblib" ]; propagatedBuildInputs = [ pyasn1 pyasn1-modules cryptography + tinydb + joblib + tinyrecord ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 1f359dfdf7c34..9fc2beef2c0d9 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -4,26 +4,33 @@ , fetchFromGitHub , pytestCheckHook , requests +, segno }: buildPythonPackage rec { pname = "fritzconnection"; - version = "1.12.2"; + version = "1.13.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kbr"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-e+w3ce6KdvbYzH48XPEQTiBgtjbKWNdQj8ie4yw0rzE="; + hash = "sha256-FTg5LHjti6Srmz1LcPU0bepNzn2tpmdSBM3Y2BzZEms="; }; propagatedBuildInputs = [ requests ]; + passthru.optional-dependencies = { + qr = [ + segno + ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; @@ -36,6 +43,11 @@ buildPythonPackage rec { "fritzconnection" ]; + disabledTestPaths = [ + # Functional tests require network access + "fritzconnection/tests/test_functional.py" + ]; + meta = with lib; { description = "Python module to communicate with the AVM Fritz!Box"; homepage = "https://github.com/kbr/fritzconnection"; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 2bc949f040d23..bd8872d779c6d 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.26"; + version = "2.5.27"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gpvfj9XwhErMPXWygZb5QMHDwCK7ZhGw6L86ttRoP/Y="; + hash = "sha256-qhYSKmHV2OGGUqfFbUiZkmUQrjSQ4I+ZX5C+D8sKj0g="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index 141654fd95957..cdffa669edcf3 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, isPy3k , fetchPypi , substituteAll , ffmpeg_4 @@ -10,8 +9,7 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; version = "0.4.8"; - - disabled = !isPy3k; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -25,6 +23,11 @@ buildPythonPackage rec { }) ]; + # https://github.com/imageio/imageio-ffmpeg/issues/59 + postPatch = '' + sed -i '/setup_requires=\["pip>19"\]/d' setup.py + ''; + checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 5fcaf478f186b..bbe9c9bf157d8 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.19.0"; + version = "3.20.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "marshmallow-code"; repo = pname; - rev = version; - hash = "sha256-b1brLHM48t45bwUXk7QreLLmvTzU0sX7Uoc1ZAgGkrE="; + rev = "refs/tags/${version}"; + hash = "sha256-sPYiup7ontnubtBxv+rIT0up4IHPJNCUlH9J4FlHsss="; }; propagatedBuildInputs = [ @@ -37,9 +37,9 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/marshmallow-code/marshmallow/blob/${src.rev}/CHANGELOG.rst"; description = "Library for converting complex objects to and from simple Python datatypes"; homepage = "https://github.com/marshmallow-code/marshmallow"; + changelog = "https://github.com/marshmallow-code/marshmallow/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ cript0nauta ]; }; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 9411838540b3c..00552394c8bbd 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-6oxKaMFXZTrz7gZpSAtXI5Jit7z5NWQgUkd1yB3EtA8="; + hash = "sha256-szeY3+84xAihGK9nLgMQf9oLRDlKlaPg6+I42TJkfVY="; }; propagatedBuildInputs = [ @@ -110,6 +110,7 @@ buildPythonPackage rec { "test_MeshInterface" "test_getNode_not_local" "test_getNode_not_local_timeout" + "test_main_onConnected_exception" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/minichain/default.nix b/pkgs/development/python-modules/minichain/default.nix new file mode 100644 index 0000000000000..1e69fbb1f25b7 --- /dev/null +++ b/pkgs/development/python-modules/minichain/default.nix @@ -0,0 +1,73 @@ +{ buildPythonPackage +, eliot +, fetchPypi +, google-search-results +, jinja2 +, lib +, manifest-ml +, openai +, pytestCheckHook +, pythonAtLeast +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "minichain"; + version = "0.3.3"; + format = "setuptools"; + + # See https://github.com/NixOS/nixpkgs/pull/248195#issuecomment-1687398702. + disabled = pythonAtLeast "3.11"; + + # See https://github.com/srush/MiniChain/issues/23 and https://github.com/NixOS/nixpkgs/issues/248185 as to why we + # don't fetchFromGitHub. + src = fetchPypi { + inherit pname version; + hash = "sha256-+mju1Mz/aojROpiOVzv6WoRNTrhgCub4yyYLEWcHWh0="; + }; + + # See https://github.com/srush/MiniChain/issues/24. + postPatch = '' + substituteInPlace ./minichain/__init__.py --replace "from .gradio import GradioConf, show" "" + ''; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRemoveDeps = [ + # Only used in the examples: + "datasets" + "faiss-cpu" + "jinja2-highlight" + "trio" + + # Not used anywhere: + "eliot-tree" + + # Not yet packaged in nixpkgs: + "gradio" + ]; + + # Some of these could be made optional. Certain packages are used by certain backends. + propagatedBuildInputs = [ + eliot + google-search-results + jinja2 + manifest-ml + openai + ]; + + # As of 0.3.3, the PyPI distribution does not include any tests. + doCheck = false; + + pythonImportsCheck = [ "minichain" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "A tiny library for coding with large language models"; + homepage = "https://srush-minichain.hf.space"; + changelog = "https://github.com/srush/MiniChain/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 76cf0b0ef1e51..150943994c8b1 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "odp-amsterdam"; - version = "5.2.0"; + version = "5.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - hash = "sha256-iJjwxvlxzRpKy2P0A3mS2i05bues5YasP72HuZiuFyE="; + hash = "sha256-HesAg6hJ8Al/ZZRBTXZM0EVv1kjYmmA66W+crwtWhf4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 2865da5cd7aa4..87e16ac90ac08 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.27.8"; + version = "0.27.9"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-7D7oi3NCqq0QSW66MqYMmc9ga02T5G4xFVic4PjgFRA="; + hash = "sha256-vp85M9VZvbY4saG88WcR3Qw8z+A9nU1Oi3sf9yitsV4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index e0e92178e4bda..b9593b0e13c16 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -82,6 +82,8 @@ buildPythonPackage rec { ]; }; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 33cfcb416cef5..6acd7c35ea3d0 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.8.2"; + version = "23.8.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gcxhSVrOeUUHIQTIR3klaiF64H4wofgLB+PV47TYfiw="; + hash = "sha256-SXCqptEADWtp295DHWeWvhsmYWAtsxfckIVbPs4ACXc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index 884decc2faca7..dee0b8cc6a857 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "protonvpn-nm-lib"; - version = "3.14.0"; + version = "3.16.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xpK3l8BI6/DUt46VR8DS89hzdHUljAbrYhEyf00giGg="; + hash = "sha256-n3jfBHMYqyQZgvFFJcylNbTWZ3teuqhdelTfpNrwWuA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index 11d1721fdc970..bc0507055f023 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -7,6 +7,7 @@ , pulumi , isPy27 , semver +, pip , pytestCheckHook , pyyaml , six @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pip pulumi.pkgs.pulumi-language-python pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix index 7f51f435ada90..4b9c5039f36af 100644 --- a/pkgs/development/python-modules/pyerfa/default.nix +++ b/pkgs/development/python-modules/pyerfa/default.nix @@ -1,7 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, jinja2 +, oldest-supported-numpy , setuptools-scm +, wheel , liberfa , packaging , numpy @@ -16,12 +19,15 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2fd4637ffe2c1e6ede7482c13f583ba7c73119d78bef90175448ce506a0ede30"; + hash = "sha256-L9Rjf/4sHm7edILBP1g7p8cxGdeL75AXVEjOUGoO3jA="; }; nativeBuildInputs = [ + jinja2 + oldest-supported-numpy packaging setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix index 0b5d016a422c5..595a997e62b2f 100644 --- a/pkgs/development/python-modules/pyfibaro/default.nix +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -6,11 +6,12 @@ , requests , requests-mock , setuptools +, wheel }: buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.2"; + version = "0.7.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,11 +20,12 @@ buildPythonPackage rec { owner = "rappenze"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dAC+jW+Ky+uPsgBXpp81+bxytWYeZbd+zWzEXkmM198="; + hash = "sha256-pCj69lLcoNTyZRe6SVkFpPK2Ex8927WzAJ5OCot9xP4="; }; nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index c080d634b83b0..609e75806678b 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyipp"; - version = "0.14.3"; + version = "0.14.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-ipp"; rev = version; - hash = "sha256-WbrAvIdFUPzSxGjIPzNny0V1W8S774vyREgylenJp24="; + hash = "sha256-xE0fdT+Ffdf4iOHWZzRa7YWtHt92lFdA/sbwjblMR40="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index c5336d7885607..bbeb9e19c3562 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -24,13 +24,13 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2023.1.1"; + version = "2023.1.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-CtkleKlKC+De3Vyk/Lbie1p13k5frHV/BMkES9nUJEQ="; + hash = "sha256-6wDNV0BJ1ZK2edz4v+erSjbJSjn9Gssaa0XWwNe+mmg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 7a3cc86a22048..647906511a17e 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.11"; + version = "0.5.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,9 +24,17 @@ buildPythonPackage rec { owner = "liudger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fTjeJZhKPFi0cxZStegVdq7a48rQ236DnnCGngwZ5GU="; + hash = "sha256-ftu79SnVa7wOMx/RiRBDPmmG7Mmw84r30G4yDzBea2k="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace "--cov" "" + sed -i "/covdefaults/d" pyproject.toml + sed -i "/ruff/d" pyproject.toml + ''; + nativeBuildInputs = [ poetry-core ]; @@ -45,12 +53,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "bsblan" ]; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 19142bc13fb85..f251b47c60862 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "python-stdnum"; - version = "1.18"; + version = "1.19"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vMdj2cSa4j2l0remhtX9He7J2QUTQRYKENGscjomvsA="; + hash = "sha256-Ez7IL1Y5DqdMGQVp6Y8vsUuGmAix1UeFcI8i0P6tiz8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix index cca38cd71ae52..6b04c0f1cd916 100644 --- a/pkgs/development/python-modules/readability-lxml/default.nix +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -31,8 +31,12 @@ buildPythonPackage rec { timeout-decorator ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # Test is broken on darwin. Fix in master from https://github.com/buriy/python-readability/pull/178 + "test_many_repeated_spaces" + ]; + meta = with lib; { - broken = stdenv.isDarwin; description = "Fast python port of arc90's readability tool"; homepage = "https://github.com/buriy/python-readability"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index c1773ffc48c32..88ffa39d7b42d 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "1.2.1"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9xSuBh3y6vYvbwn7uslM+R7yhZKP/+Sjbae1a+QMoOA="; + hash = "sha256-/ZELaJrGgNKzAXi1SXAMgxi84R0UvZBD9AUVO7PTEbA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 3feb33508c321..de652099767d3 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "23.7.1"; + version = "23.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OLIjb5mFNNi0elPeXaPoK9V0fVw2Cnd7CHjPc1oGfyM="; + hash = "sha256-VHvCvXmNwxuk4Le2VqsU1CFcHfAr40WbhELzu5wfB1U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tinyrecord/default.nix b/pkgs/development/python-modules/tinyrecord/default.nix new file mode 100644 index 0000000000000..025ffdeefd495 --- /dev/null +++ b/pkgs/development/python-modules/tinyrecord/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, tinydb +}: + +buildPythonPackage rec { + pname = "tinyrecord"; + version = "0.2.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "eugene-eeo"; + repo = "tinyrecord"; + rev = "refs/tags/v${version}"; + hash = "sha256-mF4hpHuNyiQ5DurRnyLck5e/Vp26GCLkhD8eeSB4NYs="; + }; + + nativeCheckInputs = [ + pytestCheckHook + tinydb + ]; + + pytestFlagsArray = [ + "tests.py" + ]; + + pythonImportsCheck = [ + "tinyrecord" + ]; + + meta = with lib; { + description = "Transaction support for TinyDB"; + homepage = "https://github.com/eugene-eeo/tinyrecord"; + changelog = "https://github.com/eugene-eeo/tinyrecord/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/python-modules/urwid-mitmproxy/default.nix b/pkgs/development/python-modules/urwid-mitmproxy/default.nix new file mode 100644 index 0000000000000..60dd32fc6fc39 --- /dev/null +++ b/pkgs/development/python-modules/urwid-mitmproxy/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, glibcLocales +, pythonOlder +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "urwid-mitmproxy"; + version = "2.1.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mitmproxy"; + repo = "urwid-mitmproxy"; + rev = "refs/tags/${version}"; + hash = "sha256-93AauYWbrG/2smAhbNKGE0twGJZ2u9gBetlXGCpciH8="; + }; + + pythonImportsCheck = [ + "urwid" + ]; + + # Tests which assert on strings don't decode results correctly, see urwid + doCheck = false; + + meta = with lib; { + description = "Urwid fork used by mitmproxy"; + homepage = "https://github.com/mitmproxy/urwid-mitmproxy"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index ab4d1289b924a..5035aa47857ef 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -14,13 +14,13 @@ let cutter = mkDerivation rec { pname = "cutter"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - hash = "sha256-oQ3sLIGKMEw3k27aSFcrJqo0TgGkkBNdzl6GSoOIYak="; + hash = "sha256-OxF6lKH4nnBU8pLzaCGVl8DUIxsbWD4RMevyGRirkPM="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/api-linter/default.nix b/pkgs/development/tools/api-linter/default.nix index e3fef3f134285..aa24b6d78f423 100644 --- a/pkgs/development/tools/api-linter/default.nix +++ b/pkgs/development/tools/api-linter/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "api-linter"; - version = "1.56.0"; + version = "1.56.1"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-IanIznKRmmW83/NWjW5VeBQUA/u4RSFzAQf1/QOAsK8="; + hash = "sha256-X8S8hfdfoqWRhJIuhNEZFXIAW1k5nFvE5v/7homO1Ow="; }; vendorHash = "sha256-6MvXVHg4EH5S37JnY0jnAFjDplQINWPFyd54c1W/oAE="; @@ -23,7 +23,7 @@ buildGoModule rec { "-w" ]; - # reference: https://github.com/googleapis/api-linter/blob/v1.56.0/.github/workflows/release.yaml#L76 + # reference: https://github.com/googleapis/api-linter/blob/v1.56.1/.github/workflows/release.yaml#L76 preBuild = '' cat > cmd/api-linter/version.go <<EOF package main diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 5bb00e3785712..94d84ffc0c4c0 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cocogitto"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-HlvFE7payno4cBOZEQS3stsVPBte+1EUcfca5lVlmVc="; + sha256 = "sha256-kzG22TDWGmqXuX9wr4w6PP0chbjAEqQO38jF8BGVu6w="; }; - cargoHash = "sha256-zKqWrwd5dv6Vja/BXPXLBRFzb0wwrfwFsHXau+UBPg4="; + cargoHash = "sha256-sBwR0I8eNEBglPSeSNqc7qv3eXbzcgZNBPC74Kulhbw="; # Test depend on git configuration that would likely exist in a normal user environment # and might be failing to create the test repository it works in. diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 1e8ad7239901a..fa95291295dc9 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.101.2"; + version = "0.102.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vPfdv1EtI5FAK2tIaHc+5hd1kiQvDk1Gwwqv5ug5Lco="; + sha256 = "sha256-JF93tVEwGY4wHNNkQyzxjai6S+qLzBd0SPdDgkn4Wdc="; }; - vendorHash = "sha256-qYt3NRjlImRE/G2CUYTukOCP37slseYxiJGLFtZCiDk="; + vendorHash = "sha256-ryEFSFQFASH+yzmHbxLSywg9xewbvg9JGliSJrFC4U0="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 64577d92e5f72..2931c3f3c3af5 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.20"; + version = "0.8.21"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-t7lcUbD3840kClFr4+RYRD4d2yGeYhnr2HO5giYLhNU="; + hash = "sha256-ulP159bhiVxZ5D7YamPR7AhCZ5qBr63Eitgf0/Sc6lo="; }; - vendorHash = "sha256-6NHaOF+fXs49JXEog/t2Fmr8llLmMBj7/OISssyzRK4="; + vendorHash = "sha256-nfSqu1u7NWbZYL7CEZ/i2tdxQBblRbwJwdwoEtol/Us="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index dc5104e9cd96f..61b4f4beb4b42 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.40.0"; + version = "0.40.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-leneOdV65aAUGRdVFpPuVnCmu3VmVzZXxOLJ5vspVB8="; + sha256 = "sha256-kkGBSyLirHlJOzNh8GtY6k8kxpgouqHRQQEM/eDU7TA="; }; - cargoHash = "sha256-C0cgN7G+zQZr+V/iPHh6HXV8DnPaE0bWkbJmbfIMwgk="; + cargoHash = "sha256-jImnU9ksYYmQOoaLBH+lMdoAsgo9ZFlu0tng61wrXXw="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix new file mode 100644 index 0000000000000..057f9fcea5194 --- /dev/null +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, buildNpmPackage +, fetchFromGitHub +, python3 +, xcbuild +}: + +buildNpmPackage rec { + pname = "firebase-tools"; + version = "12.4.8"; + + src = fetchFromGitHub { + owner = "firebase"; + repo = "firebase-tools"; + rev = "v${version}"; + hash = "sha256-uyw3M6EWRaiDLZg1MH1weiXih5hWh5Kz3HnB1xXISNA="; + }; + + npmDepsHash = "sha256-AjUREpqQX9+7tjO68Q9WIWQ71l5O641Oc+3Pr2khP4s="; + + postPatch = '' + ln -s npm-shrinkwrap.json package-lock.json + ''; + + nativeBuildInputs = [ + python3 + ] ++ lib.optionals stdenv.isDarwin [ + xcbuild + ]; + + env = { + PUPPETEER_SKIP_DOWNLOAD = true; + }; + + meta = { + changelog = "https://github.com/firebase/firebase-tools/blob/${src.rev}/CHANGELOG.md"; + description = "Manage, and deploy your Firebase project from the command line"; + homepage = "https://github.com/firebase/firebase-tools"; + license = lib.licenses.mit; + mainProgram = "firebase"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/tools/gotemplate/default.nix b/pkgs/development/tools/gotemplate/default.nix index ad2fb2eccc409..706fa7312d54d 100644 --- a/pkgs/development/tools/gotemplate/default.nix +++ b/pkgs/development/tools/gotemplate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotemplate"; - version = "3.7.4"; + version = "3.7.5"; src = fetchFromGitHub { owner = "coveooss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vARW8afqkcope5EcqCFju/cF6LsdEYvt3fKHEXRbmXM="; + hash = "sha256-BMZyq7fa57WaE0cSkGjHWxtEnbC7vEy+kLaHDoI/KZU="; }; vendorHash = "sha256-uRB3atrJ+A1/xXvgmkyM/AKN+9VKSIDvsnPIdtsc3vc="; diff --git a/pkgs/development/tools/misc/rhai-doc/default.nix b/pkgs/development/tools/misc/rhai-doc/default.nix new file mode 100644 index 0000000000000..dd07b8df9926c --- /dev/null +++ b/pkgs/development/tools/misc/rhai-doc/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "rhai-doc"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "rhaiscript"; + repo = "rhai-doc"; + rev = "v${version}"; + hash = "sha256-GZq5C8Q95OHKftEkps4Y6X6sAc4pzSfSq3ELUW/kPWI="; + }; + + cargoHash = "sha256-dJMqaDQVSrvZPwjPFixgqRRzxPJW/f1nO+81kHwGmYU="; + + meta = with lib; { + description = "Tool to auto-generate documentation for Rhai source code"; + homepage = "https://github.com/rhaiscript/rhai-doc"; + changelog = "https://github.com/rhaiscript/rhai-doc/releases/tag/${src.rev}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "rhai-doc"; + }; +} diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 2b7dfd292cedf..3d4e643674540 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.9.0"; + version = "5.9.2"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-mF0vbKdTACGeL1NZ57kzZANxjcHX92WtRJoU2Z4iJiM="; + hash = "sha256-ZWvxi000wxjCzAe8PnzLb3z7smBc95gky0WyrkzVmEc="; }; - cargoHash = "sha256-io0dkKDNoF+1n7D1q1JShd/Gj5Ce1Uh3dnM6uiTw0Vs="; + cargoHash = "sha256-ohovhwm/lIcNRorHtiluBVVVLIsaft/godDmte2hl9M="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.6.0/.github/workflows/publish.yml#L127-L131 + # https://github.com/latex-lsp/texlab/blob/v5.9.2/.github/workflows/publish.yml#L117-L121 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 0e73b5ee3b60b..c8e4d0e200691 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , python3 -, fetchPypi +, fetchFromGitHub , installShellFiles }: @@ -25,15 +25,22 @@ let in buildPythonApplication rec { pname = "pipenv"; version = "2023.2.4"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-GKPrpRnjbVnw1af5xCvSaFIeS5t7PRvWrc8TFWkyMnU="; + src = fetchFromGitHub { + owner = "pypa"; + repo = "pipenv"; + rev = "refs/tags/v${version}"; + hash = "sha256-jZOBu4mWyu8U6CGqtYgfcCCDSa0pGqoZEFnXl5IO+JY="; }; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + setuptools + wheel + ]; postPatch = '' # pipenv invokes python in a subprocess to create a virtualenv @@ -46,6 +53,27 @@ in buildPythonApplication rec { propagatedBuildInputs = runtimeDeps python3.pkgs; + preCheck = '' + export HOME="$TMPDIR" + ''; + + nativeCheckInputs = [ + mock + pytestCheckHook + pytest-xdist + pytz + requests + ]; + + disabledTests = [ + "test_convert_deps_to_pip" + "test_download_file" + ]; + + disabledTestPaths = [ + "tests/integration" + ]; + postInstall = '' installShellCompletion --cmd pipenv \ --bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \ @@ -53,13 +81,6 @@ in buildPythonApplication rec { --fish <(_PIPENV_COMPLETE=fish_source $out/bin/pipenv) ''; - doCheck = true; - checkPhase = '' - export HOME=$(mktemp -d) - cp -r --no-preserve=mode ${wheel.src} $HOME/wheel-src - $out/bin/pipenv install $HOME/wheel-src - ''; - meta = with lib; { description = "Python Development Workflow for Humans"; license = licenses.mit; diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix index af514c2504013..963c2d4b2a6ea 100644 --- a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix +++ b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bisect-rustc"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "rust-lang"; repo = pname; rev = "v${version}"; - hash = "sha256-i/MZslGbv72MZmd31SQFc2QdDRigs8edyN2/T5V5r4k="; + hash = "sha256-1edBGjnVsMNoP06HAEERQJ6HCkk0dRKlnt1b8GnJWsY="; }; patches = @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-dnR0V2MvW4Z3jtsjXSboCRFNb22fDGu01fC40N2Deho="; + cargoHash = "sha256-HzqGSuobGuIuLwoAPQJ1d6xUO2VJ0rcjfOYz2wdIbCk="; checkFlags = [ "--skip test_github" # requires internet diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix index 289a3bac70c68..a39482b5910ec 100644 --- a/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/pkgs/development/tools/rust/cargo-chef/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.61"; + version = "0.1.62"; src = fetchCrate { inherit pname version; - sha256 = "sha256-O3q0gfVnFMgcwWGfRgdGOwU6fauRN2qPkyTe72p3zS4="; + sha256 = "sha256-ZewsR6MgBf8wdqBIrYAuprmqthhbEA/WDShp9H3jfDs="; }; - cargoHash = "sha256-A22x2s5tHf9M6UbFHwmVNgO2qe65io/GysF1+ZE8NXM="; + cargoHash = "sha256-UHUNoI9QqHzgYIuKlj0giWfFgS+F3eUC/wuAXgwH2xQ="; meta = with lib; { description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 3ad67d41c3a99..4ef31f87c893f 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.32"; + version = "0.4.33"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-uoIfB+jkLamrsDRMaxExQC1syN6VeTJhfei8FgikTCE="; + hash = "sha256-EgUnVnSELdiRU63saQ0o2IE4vs6tcQ/AfE4aMyegJBk="; }; - cargoHash = "sha256-SXiFkPm/2C5dABKPZBq3XXdElZemZN5E2vQTceATyE0="; + cargoHash = "sha256-zq95Dzcbz08/8lumAyTfSzCEHCWWlp8Fw7R6fnfTOrk="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix index e6f6ad15e942f..a5b3bb0a14b3a 100644 --- a/pkgs/development/tools/rust/cargo-ndk/default.nix +++ b/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-ndk"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "bbqsrc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rpEBxoXm77UuK7jiaf90yxVnmJay6ptkRk5KUEBoSvk="; + sha256 = "sha256-jMhDKMFJVz/PdMnSrA+moknXPfwFhPj/fggHDAUCsNY="; }; - cargoHash = "sha256-XRT4U6zkmXzNnPnnHWrGlQWVV3W09UXQ0McksIFKgyE="; + cargoHash = "sha256-IUMS0oCucYeBSfjxIYl0hhJw2GIpSgh+Vm1iUQ+Jceo="; buildInputs = lib.optionals stdenv.isDarwin [ CoreGraphics diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/development/tools/rust/cargo-rr/default.nix index 5ffbb9fe992ae..84ec62adf87c7 100644 --- a/pkgs/development/tools/rust/cargo-rr/default.nix +++ b/pkgs/development/tools/rust/cargo-rr/default.nix @@ -1,29 +1,26 @@ { lib , rustPlatform , fetchFromGitHub -, gitUpdater -, common-updater-scripts +, nix-update-script , makeWrapper , rr }: rustPlatform.buildRustPackage rec { pname = "cargo-rr"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "danielzfranklin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lQS+bp1u79iO8WGrkZSFEuonr1eYjxIQYhUvM/kBao4"; + sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo="; }; - cargoSha256 = "sha256-PdKqWMxTtBJbNqITs3IjNcpijXy6MHitEY4jDp4jZro="; + cargoSha256 = "sha256-P4r4XRolORdSGAsNg5RutZ2VVRR8rAfiBZNm+vIH3aM="; passthru = { - updateScript = gitUpdater { - rev-prefix = "v"; - }; + updateScript = nix-update-script { }; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index abbaf78961c9b..d11a798fb7915 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.29.0"; + version = "0.30.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-VxjoS93OwJAc9Cb0VL9R/49pAcXPYrzC7q6vYJSDYB4="; + hash = "sha256-/fB6Ay9t5WkBtHVYne/dbj+PXurMpzKAb7/OFD4j7U4="; }; - cargoHash = "sha256-f8dht3HCgzeTfyhFhJS2F+TL5Y0qi+A5PGZkNXF1AUw="; + cargoHash = "sha256-PD2UsLVfc6D726BpE6a1MKjspL3/g2D9sweCmVXtH1E="; + + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config.toml + ''; meta = with lib; { description = "Generate Rust register maps (`struct`s) from SVD files"; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 1a1ca2b7c230f..702e8c8039779 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.20.4"; + version = "2.20.5"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-AsekaFoXCqzb97uTIcwf5CdqYuseMwHkKbLx1D+cD6A="; + sha256 = "sha256-gV1IL2IKbmUeOJkMfJ3Hd8xoylVi0i7ADdxaISLF+wM="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-As8NGFI23eU/FE6F6tTbnWuU/5CL2s5bY6JLB9RJmaU="; + cargoHash = "sha256-9L+wfYO5BOkpB3VqUSOJEwq671SVGlWcbXd80m/UoYI="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 40ff23f7159df..5b0c4f55f3149 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-d5TUUhGqchkrCRqJWHEewurjsHxbfZ+5hv9w9Yv2EQ4="; + sha256 = "sha256-R/Ehf379Vbh/fN6iJO6BKsUuGMe2ogJdlWosElR+7f8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/xc/default.nix b/pkgs/development/tools/xc/default.nix index c7612698f46cd..5233de5fd6eab 100644 --- a/pkgs/development/tools/xc/default.nix +++ b/pkgs/development/tools/xc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "xc"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "joerdav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Dc7MVn9hF2HtXqMvWQ5UsLQW5ZKcFKt7AHcXdiWDs1I="; + sha256 = "sha256-cVTa2ot95Hcm+1V1QXnlxSL9OjmoQNR9nVUgW/rZhl0="; }; - vendorHash = "sha256-hCdIO377LiXFKz0GfCmAADTPfoatk8YWzki7lVP3yLw="; + vendorHash = "sha256-J4/a4ujM7A6bDwRlLCYt/PmJf6HZUmdYcJMux/3KyUI="; ldflags = [ "-s" diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index 29ac2d0da3e3d..e450f472e8d50 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "chiaki"; - version = "2.1.1"; + version = "2.2.0"; src = fetchgit { url = "https://git.sr.ht/~thestr4ng3r/chiaki"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-VkCA8KS4EHuVSgoYt1YDT38hA1NEBckiBwRcgDZUSs4="; + hash = "sha256-mLx2ygMlIuDJt9iT4nIj/dcLGjMvvmneKd49L7C3BQk="; }; nativeBuildInputs = [ @@ -33,6 +33,7 @@ mkDerivation rec { protobuf python3Packages.protobuf python3Packages.python + python3Packages.setuptools ]; buildInputs = [ @@ -60,5 +61,6 @@ mkDerivation rec { license = licenses.agpl3Only; maintainers = with maintainers; [ delroth ]; platforms = platforms.all; + mainProgram = "chiaki"; }; } diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 0f28a6edd4a13..63c6901326ee6 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , fetchpatch +, canonicalize-jars-hook , cmake , cmark , Cocoa @@ -67,7 +68,7 @@ rec { }) ]; - nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja ]; + nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja canonicalize-jars-hook ]; buildInputs = [ qtbase diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index c766874224eb5..c1e48f259d799 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, file, fetchurl, autoPatchelfHook, unzip }: +{ lib +, stdenv +, fetchurl + +, autoPatchelfHook +, unzip +, zlib +}: stdenv.mkDerivation rec { pname = "terraria-server"; @@ -10,8 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-Mk+5s9OlkyTLXZYVT0+8Qcjy2Sb5uy2hcC8CML0biNY="; }; - buildInputs = [ file stdenv.cc.cc.libgcc ]; nativeBuildInputs = [ autoPatchelfHook unzip ]; + buildInputs = [ stdenv.cc.cc.libgcc zlib ]; installPhase = '' runHook preInstall @@ -29,6 +36,7 @@ stdenv.mkDerivation rec { description = "Dedicated server for Terraria, a 2D action-adventure sandbox"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; - maintainers = with maintainers; [ ncfavier ]; + mainProgram = "TerrariaServer"; + maintainers = with maintainers; [ ncfavier tomasajt ]; }; } diff --git a/pkgs/os-specific/linux/bpftune/default.nix b/pkgs/os-specific/linux/bpftune/default.nix index 7ad8496647fb0..b9daff531a56a 100644 --- a/pkgs/os-specific/linux/bpftune/default.nix +++ b/pkgs/os-specific/linux/bpftune/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bpftune"; - version = "unstable-2023-08-02"; + version = "unstable-2023-08-22"; src = fetchFromGitHub { - owner = "oracle-samples"; + owner = "oracle"; repo = "bpftune"; - rev = "f7e051a011d581a3c667b7f7b769862407d85f04"; - hash = "sha256-1tfr2vB/XRnpGJVwo2NQkXomz+J6AzvpS1P3rcAyAyI="; + rev = "ae3047976d6ba8c3ec7c21ec8c85b92d11c64169"; + hash = "sha256-yXfS3zrUxRlmWsXyDpPhvYDqgYFQTAZ2dlmiQp6/zVQ="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 3eb05f25936ff..39425f265e9ba 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -67,13 +67,13 @@ with lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.19.3"; + version = "1.19.4"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - hash = "sha256-Wt1g7/2PebpyxvIBihDBsl3DvM1EeRyOhD5ntlk0Oh0="; + hash = "sha256-XptnokBWtBx0W2k2C9jVwIYH8pOrDUbuQLvh8JrW/w8="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index d793e87c6f29e..98ddb7bb57b81 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdma-core"; - version = "46.1"; + version = "47.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${finalAttrs.version}"; - hash = "sha256-pVPWoLnWCGP+CZtG5bnOKUtjiuOa6Qic9wlGeY68w/8="; + hash = "sha256-R+qgHDu9GRwT5ic1DCDlYe1Xb4hqi8pgitKq9iBBQNQ="; }; strictDeps = true; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index d6ae074ced95b..f641836840741 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.12.1"; + version = "3.12.3"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-n++vqJlRH0C4WdZEswoaJxkuvghbu9MYhBUqFhbhISA="; + hash = "sha256-ZtfybHy6gsLcUz5LGTQrzG/a8x+s6ZkIQsiFC845NC0="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 436332834aef8..fa71aefbd24ab 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.02.3.1"; + version = "23.02.4.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-YMm8a7uyZpPEuWQcgddX+0Me+ndgbYoDnC+sbmN/Hh8="; + sha256 = "sha256-sNZqC6F7Q05AqkKVVUG4mCO3JXRjVZBppt3VgRHf5+o="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index eb3072c0c872d..b800b0b77804d 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dgraph"; - version = "23.0.1"; + version = "23.1.0"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "sha256-FB+bgrv6KojbuXDB4FKKe7eW4d9lcm9x4gA6Ceop734="; + sha256 = "sha256-AC/5ykNH2eb6IrZ3KlU0DTP4r8RiHE5iUZFCUn6H2cw="; }; - vendorHash = "sha256-HoZpxY+xT1gRHgEpkscPXogVq2eDKGlKE6KTMIQ+mMI="; + vendorHash = "sha256-YRfFRCCm25zS+tQer6UcrBBltOxA7+Iqi+Ejyrjdu/A="; doCheck = false; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index d893c10d142be..8df8b1807f093 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "0c82ae937b685dc477fb3176098e3dc106c898b7cd83553e5bc54dccb83c80d7"; + sha256 = "383ef6db1cccabd2dd788ea9385f05e98a2bafdfeb7f0eda57ff9d572f4fad71"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/gnss-share/default.nix b/pkgs/servers/gnss-share/default.nix index f0700121c3628..14aa294da503c 100644 --- a/pkgs/servers/gnss-share/default.nix +++ b/pkgs/servers/gnss-share/default.nix @@ -1,12 +1,12 @@ { buildGoModule, fetchFromGitLab, lib }: buildGoModule rec { pname = "gnss-share"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "gnss-share"; rev = version; - hash = "sha256-HlaT4TeVAyGN95cWUw1XgVNfGa+cUibh8nkBt/Eb7Yo="; + hash = "sha256-0osXA+t+trm41ekcDiJwq0IAB+6ibrlwP/c2JNAXRpU="; }; vendorHash = "sha256-a5CZxh92MW3yP/ZhwGI9UWUT8hwJ0/zeTyPNC+c2R9U="; meta = with lib; { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 298d41646154a..80d3c1a189f72 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1346,13 +1346,15 @@ psutil-home-assistant sqlalchemy xmltodict - ]; # missing inputs: fritzconnection.optional-dependencies.qr + ] + ++ fritzconnection.optional-dependencies.qr; "fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection - ]; # missing inputs: fritzconnection.optional-dependencies.qr + ] + ++ fritzconnection.optional-dependencies.qr; "fronius" = ps: with ps; [ pyfronius ]; @@ -5032,7 +5034,9 @@ "freebox" "freedns" "freedompro" + "fritz" "fritzbox" + "fritzbox_callmonitor" "fronius" "frontend" "frontier_silicon" diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index c40b8beb8b7a0..b8259e5736730 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.8.2"; + version = "2023.8.3"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-uoDpwXJfZC26oesMTv1mjO7Ib0dKamTQdIYyLJnrERk="; + hash = "sha256-odZ0rKydFtj2bwNrP3KsE5xxFLAssYMoaEe+sBMIeYI="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index 3ce5272c1d931..8913dae50be43 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-91' "${spidermonkey_91.dev}/include/mozjs-91" substituteInPlace configure --replace '/usr/include/''${SM_HEADERS}' "${spidermonkey_91.dev}/include/mozjs-91" patchShebangs bin/rebar + '' + lib.optionalString stdenv.isDarwin '' + # LTO with Clang produces LLVM bitcode, which causes linking to fail quietly. + # (There are warnings, but no hard errors, and it produces an empty dylib.) + substituteInPlace src/jiffy/rebar.config.script --replace '"-flto"' '""' ''; nativeBuildInputs = [ diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 432c94fed26f9..03b3504c68e89 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-08-15"; + version = "unstable-2023-08-21"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "01ed8096d8b53fd58f760b413533f1ef15f1b667"; - sha256 = "sha256-vP1EmvUmxYRlBcxY7MKnBpLaSTEi5bZGaP42TsJhfjw="; + rev = "5f990f93d533247d3a675e8c423280f4333ad8ce"; + sha256 = "sha256-jICOEzLvy2wBInW4qIbFZbhRuHjsio6UM13K9UlZi1U="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/klipper/klipper-genconf.nix b/pkgs/servers/klipper/klipper-genconf.nix index d810bccd4366d..293a8112007bf 100644 --- a/pkgs/servers/klipper/klipper-genconf.nix +++ b/pkgs/servers/klipper/klipper-genconf.nix @@ -2,12 +2,10 @@ , klipper , python3 , gnumake -, pkgsCross }: writeShellApplication { name = "klipper-genconf"; runtimeInputs = [ python3 - pkgsCross.avr.stdenv.cc gnumake ]; text = '' diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix index a282565ddfe3b..013a66ef3d3f4 100644 --- a/pkgs/servers/nitter/default.nix +++ b/pkgs/servers/nitter/default.nix @@ -21,13 +21,13 @@ buildNimPackage rec { pname = "nitter"; - version = "unstable-2023-07-21"; + version = "unstable-2023-08-08"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "cc5841df308506356d329662d0f0c2ec4713a35c"; - hash = "sha256-QuWLoKy7suUCTYK79ghdf3o/FGFIDNyN1Iu69DFp6wg="; + rev = "d7ca353a55ea3440a2ec1f09155951210a374cc7"; + hash = "sha256-nlpUzbMkDzDk1n4X+9Wk7+qQk+KOfs5ID6euIfHBoa8="; }; patches = [ diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index fc21fedc03d11..5d91e6dc32459 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "7.3"; + version = "7.3.1"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-teZ9oJ5aUPs0aTUxyK9UmpFRclHZVLEVl0jlWbrbiBs="; + hash = "sha256-bnnuIoARr7awwdxDo9NDKy1HEJVl24YTqYhBpmc8n/o="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/ansible/doctor.nix b/pkgs/tools/admin/ansible/doctor.nix index e51d2faced9de..ef7ef6aabb85b 100644 --- a/pkgs/tools/admin/ansible/doctor.nix +++ b/pkgs/tools/admin/ansible/doctor.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3 }: @@ -15,15 +16,20 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-nZv1PdR0kGrke2AjcDWjDWBdsw64UpHYFNDFAe/UoJo="; }; - pythonRelaxDeps = true; + patches = [ + # https://github.com/thegeeklab/ansible-doctor/pull/541 + (fetchpatch { + name = "poetry-dynamic-versioning-pep517.patch"; + url = "https://github.com/thegeeklab/ansible-doctor/commit/b77ba9dccaef4b386bd54b128136c948665eb61a.patch"; + hash = "sha256-XfdTkRk9B857V5DQnxlbwxTb098YwHzKGzNQBTQzWCM="; + }) + ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' - ''; + pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ poetry-core + poetry-dynamic-versioning pythonRelaxDepsHook ]; diff --git a/pkgs/tools/admin/ansible/later.nix b/pkgs/tools/admin/ansible/later.nix index db1c7beb2a58f..733981ecd9288 100644 --- a/pkgs/tools/admin/ansible/later.nix +++ b/pkgs/tools/admin/ansible/later.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3 }: @@ -15,9 +16,17 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-7k81eEcM+BXNrln6+Lu0+1LjsZdYkUidrRQCdlBbQB8="; }; + patches = [ + # https://github.com/thegeeklab/ansible-later/pull/658 + (fetchpatch { + name = "poetry-dynamic-versioning-pep517.patch"; + url = "https://github.com/thegeeklab/ansible-later/commit/a2c278fb45769648df1439df5bb25883dddfc58a.patch"; + hash = "sha256-++CiwwHZoaPC8XHaYbNQeU3zqEi2a4eIYbuSQkO0jTI="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ --replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --no-cov-on-fail" "" ''; @@ -34,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core + poetry-dynamic-versioning pythonRelaxDepsHook ]; diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index 32421a62da599..1a96f3bcfbe40 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "unstable-2023-06-27"; + version = "unstable-2023-08-22"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "36debf46ac184a22c6936345d22e4cfad995948c"; - hash = "sha256-ebqw1jqeRC0FWeUIO/HaEovuwzU6+B48TjZbVJXByvA="; + rev = "c91c6fac9d725716ca6ecc3002053f941137f24f"; + hash = "sha256-oGcKRx1tP2jeshHhaCHPRKmwKQ3WPYK1tHGGt1/3oDU="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index ddec00489dbfd..1af08922edcea 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , python3 +, fetchpatch , fetchPypi , openssl # Many Salt modules require various Python modules to be installed, @@ -11,28 +12,20 @@ python3.pkgs.buildPythonApplication rec { pname = "salt"; version = "3006.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-+I0aJeIw2co9/eE9rdRmB6KxdQq1WoY1nFpCUedx8Wc="; }; - propagatedBuildInputs = with python3.pkgs; [ - distro - jinja2 - jmespath - looseversion - markupsafe - msgpack - packaging - psutil - pycryptodomex - pyyaml - pyzmq - requests - ] ++ extraInputs; - patches = [ + # https://github.com/saltstack/salt/pull/63795 + (fetchpatch { + name = "remove-duplicate-scripts.patch"; + url = "https://github.com/saltstack/salt/commit/6b9463836e70e40409dbf653f01aa94ef869dfe7.patch"; + hash = "sha256-VcVdKC8EH4qoWHtq6eEPl8OviR4eA2k/S2lWNQbubJw="; + }) ./fix-libcrypto-loading.patch ]; @@ -51,6 +44,21 @@ python3.pkgs.buildPythonApplication rec { --replace 'pyzmq==25.0.2 ; sys_platform == "win32"' "" ''; + propagatedBuildInputs = with python3.pkgs; [ + distro + jinja2 + jmespath + looseversion + markupsafe + msgpack + packaging + psutil + pycryptodomex + pyyaml + pyzmq + requests + ] ++ extraInputs; + # Don't use fixed dependencies on Darwin USE_STATIC_REQUIREMENTS = "0"; diff --git a/pkgs/tools/backup/gyb/default.nix b/pkgs/tools/backup/gyb/default.nix index 5f69ea016b1de..260ca6eafcd87 100644 --- a/pkgs/tools/backup/gyb/default.nix +++ b/pkgs/tools/backup/gyb/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "gyb"; - version = "1.72"; + version = "1.74"; format = "other"; src = fetchFromGitHub { owner = "GAM-team"; repo = "got-your-back"; rev = "refs/tags/v${version}"; - sha256 = "sha256-75ZU1qNFdiX9Uhb+tKN0438iHKvY4fuFVGvcgyFFgJo="; + sha256 = "sha256-JUI9BIDg7Z6z5ZtwBMsgTbYXp9w0jd1DKFAa1XjeEtQ="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/filesystems/dysk/default.nix b/pkgs/tools/filesystems/dysk/default.nix index fe4e61014a635..2ca03fa9a741d 100644 --- a/pkgs/tools/filesystems/dysk/default.nix +++ b/pkgs/tools/filesystems/dysk/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "dysk"; - version = "2.7.2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; rev = "v${version}"; - hash = "sha256-3uukeuxB1GjmJ59bkgDEzgG9RMZhmB5TSv3uiXV8GNg="; + hash = "sha256-BbL7liiZ1Xcg2Pr2JDnP5DAbjVdDVRs/hndZyIX8jfQ="; }; - cargoHash = "sha256-td4B9/DAmASqLGO3PVLLWeO3GeDbLHI7wNcOT1qk20k="; + cargoHash = "sha256-vMWr3cV1ttjjwBvgQgi3aCpejr/enoYILVhI4wP9wa0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 15eda5112c38f..973aa41d5ca2c 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.3.2"; + version = "11.3.4"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4574"; - sha256 = "fJv+74QN7Jro4vUCcMWL4Yvv1C0KkfiOoNHt6ldGn/s="; + rev = "4606"; + sha256 = "raWpqPlORgL5vBkmHbvj7UCrGjpPLulWjeTuaPnuB98="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/btc-rpc-explorer/default.nix b/pkgs/tools/misc/btc-rpc-explorer/default.nix new file mode 100644 index 0000000000000..9e548d5f3dfdb --- /dev/null +++ b/pkgs/tools/misc/btc-rpc-explorer/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, pkg-config +, python3 +, vips +}: + +buildNpmPackage rec { + pname = "btc-rpc-explorer"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "janoside"; + repo = "btc-rpc-explorer"; + rev = "v${version}"; + hash = "sha256-ZGg3jwSl1XyzS9hMa2YqwExhHSNgrsUmSscZtfF2h54="; + }; + + npmDepsHash = "sha256-9pVjydGaEaHytZqwXv0/kaJAVqlE7zzuTvubBFTkuBg="; + + postPatch = '' + ln -s npm-shrinkwrap.json package-lock.json + ''; + + makeCacheWritable = true; + + nativeBuildInputs = [ + pkg-config + python3 + ]; + + buildInputs = [ + vips + ]; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/janoside/btc-rpc-explorer/blob/${src.rev}/CHANGELOG.md"; + description = "Database-free, self-hosted Bitcoin explorer, via RPC to Bitcoin Core"; + homepage = "https://github.com/janoside/btc-rpc-explorer"; + license = lib.licenses.mit; + mainProgram = "btc-rpc-explorer"; + maintainers = with lib.maintainers; [ d-xo ]; + }; +} diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index d37c5bbe5fed9..f700f0477333e 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.37.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-AXn2D4vWiFYlmAN2egqKdi5vOYU88FopEGYyDGgy0ig="; + hash = "sha256-s8E+Nva/lsZ/jPzDuGRN0P8JOeJPUK6Xj6bHqiozwNA="; }; - vendorHash = "sha256-OU1ChDJiIeRjBBKVcxah/cEXScepW0VY9tkNDALT4fI="; + vendorHash = "sha256-UFEpP5I++8+F8OTMqm5G6/2Kn31Q2U3+8g0deeLMWDc="; doCheck = false; diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 1b33f15ce2032..6ee0ca8a8702f 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cloud-sql-proxy"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-/mXaNRTRIBIPUHY/MOHpGmpB8wBp18wwftn/EdmoffQ="; + hash = "sha256-YbfN9ZdcxP78/dNaONBhb1UqcZYJcet+lHuKmvXk9MI="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-VadE9E4B8BIIHGl+PN4oDl0H56xE3GQn0MxGw5fGsvM="; + vendorHash = "sha256-2Cu9o26R9y2EBUB9kLf98n2AKFOE7NE1NrcMD+8pvRY="; preCheck = '' buildFlagsArray+="-short" diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index e736ce1468a9a..2845706170323 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -78,11 +78,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "246"; + version = "247"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-z7wrc8hveKqMJsJMLQXO3z+wcJxpY8QFoYxTBUzfGPg="; + hash = "sha256-sbLny1eK/eyCQKeSUyQc3DTvlHeCp8rAgrx681KjvNQ="; }; outputs = [ diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 8a3f2579543a7..ea6cfdfb282fc 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.8.1"; + version = "2023.8.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-a85nNUVaa7CbYdI/xM30fp7i1gMRz18Ior4mwseFZqU="; + hash = "sha256-KizeBaDw/9XoPwIjjc3VKkiaHTK5VYQXss4cQZZaGzs="; }; postPatch = '' diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/tools/misc/eza/default.nix index 715eee9c05d05..8ee47ac4cd70e 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/tools/misc/eza/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.10.7"; + version = "0.10.8"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-f8js+zToP61lgmxucz2gyh3uRZeZSnoxS4vuqLNVO7c="; + hash = "sha256-3g4eauJqnbIqWtDmRvKsDiZh1eAz171FP9idF2nBXLQ="; }; - cargoHash = "sha256-G3zNv8pG9uS12PsBug51RaS9Hx0sGHHnVEF4bHb+v18="; + cargoHash = "sha256-HS/nmLxr5zvyneiSJk9tPUhszF5vFwSo5HMsRql9I38="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix index a97b887f1caaf..48f9fa7a7bba9 100644 --- a/pkgs/tools/misc/gaphor/default.nix +++ b/pkgs/tools/misc/gaphor/default.nix @@ -59,7 +59,7 @@ buildPythonApplication rec { desktopName = "Gaphor"; }; - # We need to wrap it manually to resolve all icons + # Disable automatic wrapGAppsHook to prevent double wrapping dontWrapGApps = true; postInstall = '' @@ -67,10 +67,11 @@ buildPythonApplication rec { ''; preFixup = '' - wrapProgram $out/bin/gaphor \ - ''${gappsWrapperArgs[@]} \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + ) ''; meta = with lib; { diff --git a/pkgs/tools/misc/hyperpotamus/default.nix b/pkgs/tools/misc/hyperpotamus/default.nix new file mode 100644 index 0000000000000..869b8aea9143a --- /dev/null +++ b/pkgs/tools/misc/hyperpotamus/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "hyperpotamus"; + version = "0.39.0"; + + src = fetchFromGitHub { + owner = "pmarkert"; + repo = "hyperpotamus"; + rev = "v${version}"; + hash = "sha256-dExkvObz+PNjqAZnigZHs/DCSHq31jDg9pgFmmtPmWk="; + }; + + npmDepsHash = "sha256-cH0VEhs4q13gnFKQmmu8fXjueBu/u7xtySE6HTm+bik="; + + dontNpmBuild = true; + + meta = { + description = "YAML based HTTP script processing engine"; + homepage = "https://github.com/pmarkert/hyperpotamus"; + license = lib.licenses.mit; + mainProgram = "hyperpotamus"; + maintainers = with lib.maintainers; [ onny ]; + }; +} diff --git a/pkgs/tools/misc/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index d8463766f823f..8de3155337466 100644 --- a/pkgs/tools/misc/ollama/default.nix +++ b/pkgs/tools/misc/ollama/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ollama"; - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-QFik6Vlo06s2Nz5tsS3yvm3JYhCTIZHMiphtqz99sTI="; + hash = "sha256-p2YLgLyjmf2MPvFue45+wW7kqKpUli9rX3aWNH08cDk="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ @@ -22,7 +22,7 @@ buildGoModule rec { MetalKit ]); - vendorHash = "sha256-eAvedN47InwUcsWLtnzxuLnmyeOoxHEDtQy9kjsFJnE="; + vendorHash = "sha256-IgEf/WOc1eNGCif1fViIFxbgZAd6mHBqfxcaqH/WvGg="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/tools/misc/pipreqs/default.nix index 3e22fa839e143..2689581b6c062 100644 --- a/pkgs/tools/misc/pipreqs/default.nix +++ b/pkgs/tools/misc/pipreqs/default.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "pipreqs"; - version = "0.4.11"; + version = "0.4.13"; src = fetchPypi { inherit pname version; - sha256 = "c793b4e147ac437871b3a962c5ce467e129c859ece5ba79aca83c20f4d9c3aef"; + hash = "sha256-oX8WeIC2khvjdTPOTIHdxuIrRlwQeq1VfbQ7Gt1WqZs="; }; propagatedBuildInputs = [ yarg docopt ]; diff --git a/pkgs/tools/misc/starry/default.nix b/pkgs/tools/misc/starry/default.nix new file mode 100644 index 0000000000000..b2ffe3175bfbc --- /dev/null +++ b/pkgs/tools/misc/starry/default.nix @@ -0,0 +1,38 @@ +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "starry"; + version = "2.0.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-CPEMjg70MXlV+ruYnEHpTmqlc27NMTUKTR4/fpQmYcI="; + }; + + cargoHash = "sha256-d6icXOgju4qEV2+J+G09/xeQMIX3/4XUFmuWfD/Cqhc="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Current stars history tells only half the story"; + homepage = "https://github.com/Canop/starry"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "starry"; + }; +} diff --git a/pkgs/tools/misc/tere/default.nix b/pkgs/tools/misc/tere/default.nix index 216a0db0c83b9..a2a4a506bc0d0 100644 --- a/pkgs/tools/misc/tere/default.nix +++ b/pkgs/tools/misc/tere/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tere"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "mgunyho"; repo = "tere"; rev = "v${version}"; - sha256 = "sha256-gEoy7pwZxlCIPTQZVPSo5TIdmSliSSePunXO3hD3Ryo="; + sha256 = "sha256-xqbFBRzBfTwSdkC8e85yANdVA45G6E1FYlTXP8QfVIk="; }; - cargoSha256 = "sha256-4XvVisRLSHw4jz+nUndWzS1IK2tnzmxdcgqNHHOvkQg="; + cargoHash = "sha256-Y2Zgo/VAJxzQd2cXxyiJS5AqcVRClAuUsEogivK3EJw="; postPatch = '' rm .cargo/config.toml; diff --git a/pkgs/tools/misc/zotero-translation-server/default.nix b/pkgs/tools/misc/zotero-translation-server/default.nix new file mode 100644 index 0000000000000..21428cf124584 --- /dev/null +++ b/pkgs/tools/misc/zotero-translation-server/default.nix @@ -0,0 +1,35 @@ +{ lib, buildNpmPackage, fetchFromGitHub, nodejs }: + +buildNpmPackage rec { + pname = "zotero-translation-server"; + version = "unstable-2023-07-13"; + + src = fetchFromGitHub { + owner = "zotero"; + repo = "translation-server"; + rev = "cf96d57f4e2af66fee7df9bad00681b3f4ac7d77"; + hash = "sha256-GJn7UAl0raVGzplvFzo4A0RUjNbyGt/YI2mt1UZIJv0="; + fetchSubmodules = true; + }; + + npmDepsHash = "sha256-JHoBxUybs1GGRxEVG5GgX2mOCplTgR5dcPjnR42SEbY="; + + makeCacheWritable = true; + + dontNpmBuild = true; + + postInstall = '' + mkdir -p $out/bin/ $out/share/zotero-translation-server/ + makeWrapper ${nodejs}/bin/node $out/bin/translation-server \ + --add-flags "$out/lib/node_modules/translation-server/src/server.js" + ln -s $out/lib/node_modules/translation-server/config $out/share/zotero-translation-server/config + ln -s $out/lib/node_modules/translation-server/modules $out/share/zotero-translation-server/modules + ''; + + meta = with lib; { + description = "A Node.js-based server to run Zotero translators"; + homepage = "https://github.com/zotero/translation-server"; + license = licenses.agpl3Only; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index a6b6d266cb4de..d5a54ba15e927 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "chisel"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "jpillora"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Rq8IBT29K3QiaYXFaARg5ak9llcNS/9laal/LrHM4zY="; + hash = "sha256-hZm0dVDwX6cHiN0TvAcHCWbMAf+k9CCQfC9nlV2vfN4="; }; vendorHash = "sha256-i6Fb+jSP6LzZoPTHhjQi3YbPBWY6OmsORV8ATcLrHG0="; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 7eba0e1f21505..6cce7d247a5e5 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clash"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-hUkUfNsThir0txO7cdxJl3sUF8/wHDvDPVspGp5xYUQ="; + rev = "v${version}"; + hash = "sha256-LqjSPlPkR5sB4Z1pmpdE9r66NN7pwgE9GK4r1zSFlxs="; }; - vendorHash = "sha256-M2hoorCBdq2nm5Gc5Xm6r7Cg9XUOirDyqTKwrmu121s="; + vendorHash = "sha256-EWAbEFYr15RiJk9IXF6KaaX4GaSCa6E4+8rKL4/XG8Y="; # Do not build testing suit excludedPackages = [ "./test" ]; @@ -29,6 +29,10 @@ buildGoModule rec { "-X github.com/Dreamacro/clash/constant.Version=${version}" ]; + checkFlags = [ + "-skip=TestParseRule" # Flaky tests + ]; + passthru.tests.version = testers.testVersion { package = clash; command = "clash -v"; diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index c96ec005577b8..51879351fd818 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "containerlab"; - version = "0.44.0"; + version = "0.44.2"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-r3rN1HSNz8aFjMjg/s1YNSgv9/YZZAgjowQXO81eT84="; + hash = "sha256-W05FPyBAKnndrELXytrXzpfTcEtq3Q2RDvOQkKMpvwI="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index 10b9beafb7bc9..6a711adcd5d6f 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "5.6.0"; + version = "5.6.1"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-w9/5n5QKx+pNiA0wBTjjwllsAvsGUH53buwmx2CIZIg="; + hash = "sha256-uVYTAJhTQDNknBZmE8uaX4h5lU7cb/cyzIoTV2iHGJ8="; }; vendorHash = "sha256-azsXfWa4w3wZaiy9AKy7UPOybikubcJvLsXthYedmbY="; diff --git a/pkgs/tools/networking/graphqurl/default.nix b/pkgs/tools/networking/graphqurl/default.nix new file mode 100644 index 0000000000000..e0b6fa9de9c01 --- /dev/null +++ b/pkgs/tools/networking/graphqurl/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "graphqurl"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "hasura"; + repo = "graphqurl"; + rev = "v${version}"; + hash = "sha256-0dR8lLD0yatAvE3kA90cNOzVRTFpQmzN1l13hdFr3TM="; + }; + + npmDepsHash = "sha256-2kLmhNFO/ySa6S9rBNYCePmsYXWz006IxiOJ7ZUkgPw="; + + dontNpmBuild = true; + + meta = { + description = "CLI and JS library for making GraphQL queries"; + homepage = "https://github.com/hasura/graphqurl"; + license = lib.licenses.asl20; + mainProgram = "gq"; + maintainers = with lib.maintainers; [ bbigras ]; + }; +} diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix index a95b787ef0f53..1d81627bf29c3 100644 --- a/pkgs/tools/networking/opensnitch/daemon.nix +++ b/pkgs/tools/networking/opensnitch/daemon.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "opensnitch"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "v${version}"; - hash = "sha256-1ArwbewgZuoDF2lxY720yFQSsTuLR0WkS8vsTCr2FL4="; + hash = "sha256-C8Uuz2FC7Zu07ZmFpp+ejpNxkyC3/mM9J2dc5FUKx64="; }; modRoot = "daemon"; diff --git a/pkgs/tools/package-management/deploy-rs/default.nix b/pkgs/tools/package-management/deploy-rs/default.nix index 86c0963db1788..fbb8a644e35b1 100644 --- a/pkgs/tools/package-management/deploy-rs/default.nix +++ b/pkgs/tools/package-management/deploy-rs/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/serokell/deploy-rs"; license = licenses.mpl20; maintainers = with maintainers; [ teutat3s ]; + mainProgram = "deploy"; }; } diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 6383d0f51d7ca..f4d4a66e04ab9 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.9.11"; + version = "2.9.12"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OZAHB1QmdZSARHF7Nd8SzmTGfRk4Wi/89nVYjW0Cpso="; + hash = "sha256-XLSNBFblgDkGGimwx0KqgHfDOekj7GH81EaKQ106v5U="; }; - vendorHash = "sha256-L8EwfyYtsnQChs0KQW2e/tU3zKua1HdDX91YX5ay9qo="; + vendorHash = "sha256-/1F2aY3cRLRz06s1KXQ6bt7UgaZgiXEjS/5stGi7xIw="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/tools/text/clima/default.nix b/pkgs/tools/text/clima/default.nix new file mode 100644 index 0000000000000..cfa39590a7144 --- /dev/null +++ b/pkgs/tools/text/clima/default.nix @@ -0,0 +1,33 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "clima"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "Canop"; + repo = "clima"; + rev = "v${version}"; + hash = "sha256-CRnAxhkuCTyHR4uQofA51Dm3+YKqm3iwBkFNkbLTv1A="; + }; + + cargoHash = "sha256-jKY+Ta6lqMBUlqSViKk3W0CiO8oU+ucmleKDYRA54HQ="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "A minimal viewer for Termimad"; + homepage = "https://github.com/Canop/clima"; + changelog = "https://github.com/Canop/clima/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "clima"; + }; +} diff --git a/pkgs/tools/text/markdownlint-cli2/default.nix b/pkgs/tools/text/markdownlint-cli2/default.nix new file mode 100644 index 0000000000000..86e1338a09ef3 --- /dev/null +++ b/pkgs/tools/text/markdownlint-cli2/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "markdownlint-cli2"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "DavidAnson"; + repo = "markdownlint-cli2"; + rev = "v${version}"; + hash = "sha256-qtdR7Rhz+HLZJX82OrN+twOsvFOv99e4BBDVV1UayPI="; + }; + + npmDepsHash = "sha256-Fx0lDcvzLRVSAX0apKmu1CBfnGmGQR9FQEdhHUtue/c="; + + postPatch = '' + ln -s npm-shrinkwrap.json package-lock.json + ''; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/DavidAnson/markdownlint-cli2/blob/${src.rev}/CHANGELOG.md"; + description = "A fast, flexible, configuration-based command-line interface for linting Markdown/CommonMark files with the markdownlint library"; + homepage = "https://github.com/DavidAnson/markdownlint-cli2"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/tools/text/wrap/default.nix b/pkgs/tools/text/wrap/default.nix index 728cad2c3fee5..4eebcf60437bd 100644 --- a/pkgs/tools/text/wrap/default.nix +++ b/pkgs/tools/text/wrap/default.nix @@ -8,18 +8,23 @@ buildGoModule rec { owner = "Wraparound"; repo = "wrap"; rev = "v${version}"; - sha256 = "0scf7v83p40r9k7k5v41rwiy9yyanfv3jm6jxs9bspxpywgjrk77"; + hash = "sha256-58wsH/e3X72S7tJUObazyvvkI8+B7DLPTBmQO9A+jmk="; }; - nativeBuildInputs = [ makeWrapper ]; + vendorHash = "sha256-vg61Vypd+mSF9FyLFVpnS5UCTJDoobkDE1Cneg8O0RM="; - vendorSha256 = null; #vendorSha256 = ""; + nativeBuildInputs = [ makeWrapper ]; patches = [ (fetchpatch { name = "courier-prime-variants.patch"; url = "https://github.com/Wraparound/wrap/commit/b72c280b6eddba9ec7b3507c1f143eb28a85c9c1.patch"; - sha256 = "1d9v0agfd7mgd17k4a8l6vr2kyswyfsyq3933dz56pgs5d3jric5"; + hash = "sha256-hcUsRyv6XVN+GyMN7LXzXPsp8jYUKTJPaK+e5p4CO7U="; + }) + # Fix build on Go 1.17+ + (fetchpatch { + url = "https://github.com/Wraparound/wrap/commit/a222c18a7e0810486741684781ff6158a359a8ba.patch"; + hash = "sha256-eIKvA91olfbNJhOhIUu3GOL/rbgX3m6unmU8nRdKbtc="; }) ]; @@ -32,6 +37,5 @@ buildGoModule rec { homepage = "https://github.com/Wraparound/wrap"; license = licenses.gpl3Only; maintainers = [ maintainers.austinbutler ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/tools/typesetting/carbon-now-cli/default.nix b/pkgs/tools/typesetting/carbon-now-cli/default.nix new file mode 100644 index 0000000000000..7d35283ab74c6 --- /dev/null +++ b/pkgs/tools/typesetting/carbon-now-cli/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "carbon-now-cli"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "mixn"; + repo = "carbon-now-cli"; + rev = "v${version}"; + hash = "sha256-2fqZdPkVM3qBZKacBv9dX99Q9WnM5m7OpChG2n1TnXg="; + }; + + npmDepsHash = "sha256-UgrgnaA+GXRQT3dtAoMq6tsZZ2gV1CQNoYG58IuSZUM="; + + postPatch = '' + substituteInPlace package.json \ + --replace "bundle/cli.js" "dist/cli.js" \ + --replace "trash " "rm -rf " \ + --replace "npx playwright install --with-deps" "true" + ''; + + env = { + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; + }; + + meta = { + description = "Beautiful images of your code — from right inside your terminal"; + homepage = "https://github.com/mixn/carbon-now-cli"; + license = lib.licenses.mit; + mainProgram = "carbon-now"; + maintainers = with lib.maintainers; [ rmcgibbo ]; + }; +} diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index b199bc0a50ddb..b57ce3abb1683 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GcfRnYOMrkMBIc2s6u/kwzh1kCFo2+PQCIcQyXxVdDM="; + sha256 = "sha256-inw4bPeObMlwtgFLR/8+tqRKTkcViZeEFZ1MOm0HYI4="; }; vendorHash = null; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2fa19974f1ee0..1a3191b08c5d4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -833,6 +833,7 @@ mapAliases ({ kexpand = throw "kexpand awless has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-01 keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14 + kfctl = throw "kfctl is broken and has been archived by upstream" ; # Added 2023-08-21 kgx = gnome-console; # Added 2022-02-19 kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 kicad-with-packages3d = kicad; # Added 2019-11-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c9d29efe77b4..771f9a19eed68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1658,10 +1658,14 @@ with pkgs; basez = callPackage ../tools/misc/basez { }; + btc-rpc-explorer = callPackage ../tools/misc/btc-rpc-explorer { }; + butler = callPackage ../games/itch/butler.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; + carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { }; + cf-vault = callPackage ../tools/admin/cf-vault { }; cfonts = callPackage ../tools/misc/cfonts { }; @@ -1804,6 +1808,8 @@ with pkgs; httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { }; + hyperpotamus = callPackage ../tools/misc/hyperpotamus { }; + immich-cli = callPackage ../tools/misc/immich-cli { }; inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service; @@ -1842,6 +1848,8 @@ with pkgs; markdownlint-cli = callPackage ../tools/text/markdownlint-cli { }; + markdownlint-cli2 = callPackage ../tools/text/markdownlint-cli2 { }; + mbidled = callPackage ../tools/networking/mbidled { }; metapixel = callPackage ../tools/graphics/metapixel { }; @@ -4214,7 +4222,7 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - beautysh = callPackage ../development/tools/beautysh { }; + beautysh = with python3.pkgs; toPythonApplication beautysh; bc = callPackage ../tools/misc/bc { }; @@ -4575,7 +4583,9 @@ with pkgs; map-cmd = callPackage ../tools/misc/map { }; - clash = callPackage ../tools/networking/clash { }; + clash = callPackage ../tools/networking/clash { + buildGoModule = buildGo121Module; + }; clash-geoip = callPackage ../data/misc/clash-geoip { }; @@ -6757,6 +6767,8 @@ with pkgs; ; citrix_workspace = citrix_workspace_23_07_0; + clima = callPackage ../tools/text/clima { }; + cmigemo = callPackage ../tools/text/cmigemo { }; cmospwd = callPackage ../tools/security/cmospwd { }; @@ -7626,6 +7638,8 @@ with pkgs; rar2fs = callPackage ../tools/filesystems/rar2fs { }; + rune = callPackage ../development/interpreters/rune { }; + s9fes = callPackage ../development/interpreters/s9fes { }; s-tar = callPackage ../tools/archivers/s-tar { }; @@ -7761,6 +7775,8 @@ with pkgs; zonemaster-cli = perlPackages.ZonemasterCLI; + zotero-translation-server = callPackage ../tools/misc/zotero-translation-server { }; + zoxide = callPackage ../tools/misc/zoxide { }; zzuf = callPackage ../tools/security/zzuf { }; @@ -9658,8 +9674,6 @@ with pkgs; jdk = jdk11; }; - kfctl = callPackage ../applications/networking/cluster/kfctl { }; - kluctl = callPackage ../applications/networking/cluster/kluctl { }; kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { }; @@ -12486,6 +12500,8 @@ with pkgs; rekor-cli rekor-server; + rhai-doc = callPackage ../development/tools/misc/rhai-doc { }; + rich-cli = callPackage ../misc/rich-cli { }; richgo = callPackage ../development/tools/richgo { }; @@ -17705,6 +17721,8 @@ with pkgs; graphqlmap = callPackage ../tools/security/graphqlmap { }; + graphqurl = callPackage ../tools/networking/graphqurl { }; + groovy = callPackage ../development/interpreters/groovy { }; inherit (callPackages ../applications/networking/cluster/hadoop { @@ -18913,6 +18931,8 @@ with pkgs; cookiecutter = with python3Packages; toPythonApplication cookiecutter; + cordova = callPackage ../development/mobile/cordova { }; + corrosion = callPackage ../development/tools/build-managers/corrosion { }; corundum = callPackage ../development/tools/corundum { }; @@ -19211,6 +19231,8 @@ with pkgs; findnewest = callPackage ../development/tools/misc/findnewest { }; + firebase-tools = callPackage ../development/tools/firebase-tools { }; + flootty = callPackage ../development/tools/flootty { }; fffuu = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); @@ -29965,6 +29987,8 @@ with pkgs; starfetch = callPackage ../tools/misc/starfetch { }; + starry = callPackage ../tools/misc/starry { }; + starship = callPackage ../tools/misc/starship { inherit (darwin.apple_sdk.frameworks) Security Foundation Cocoa; }; @@ -33406,7 +33430,10 @@ with pkgs; lifelines = callPackage ../applications/misc/lifelines { }; - liferea = callPackage ../applications/networking/newsreaders/liferea { }; + liferea = callPackage ../applications/networking/newsreaders/liferea { + libsoup = libsoup_3; + webkitgtk = webkitgtk_4_1; + }; lightworks = callPackage ../applications/video/lightworks { }; @@ -42033,4 +42060,6 @@ with pkgs; wttrbar = callPackage ../applications/misc/wttrbar { }; wpm = callPackage ../applications/misc/wpm { }; + + yazi = callPackage ../applications/file-managers/yazi { inherit (darwin.apple_sdk.frameworks) Foundation; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 824f526d2a76b..4e4f492cf96ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -316,6 +316,8 @@ self: super: with self; { aioquic = callPackage ../development/python-modules/aioquic { }; + aioquic-mitmproxy = callPackage ../development/python-modules/aioquic-mitmproxy { }; + aiorecollect = callPackage ../development/python-modules/aiorecollect { }; aioredis = callPackage ../development/python-modules/aioredis { }; @@ -1312,6 +1314,8 @@ self: super: with self; { beautifultable = callPackage ../development/python-modules/beautifultable { }; + beautysh = callPackage ../development/python-modules/beautysh { }; + bech32 = callPackage ../development/python-modules/bech32 { }; behave = callPackage ../development/python-modules/behave { }; @@ -6548,6 +6552,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox CoreAudio; }; + minichain = callPackage ../development/python-modules/minichain { }; + minidb = callPackage ../development/python-modules/minidb { }; minidump = callPackage ../development/python-modules/minidump { }; @@ -12739,6 +12745,8 @@ self: super: with self; { tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { }; + tinyrecord = callPackage ../development/python-modules/tinyrecord { }; + tissue = callPackage ../development/python-modules/tissue { }; titlecase = callPackage ../development/python-modules/titlecase { }; @@ -13312,6 +13320,8 @@ self: super: with self; { urwid-readline = callPackage ../development/python-modules/urwid-readline { }; + urwid-mitmproxy = callPackage ../development/python-modules/urwid-mitmproxy { }; + usb-devices = callPackage ../development/python-modules/usb-devices { }; usbrelay-py = callPackage ../os-specific/linux/usbrelay/python.nix { }; |